Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectplanweekly/projectPlanWeeklyList.jsp

@@ -181,7 +181,7 @@
 					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					<div class="commonQuery lw6">
 						<div class="layui-item query athird ">
-							<label class="layui-form-label double-line"><span class="require-item">*</span>任务完成状态：</label>
+							<label class="layui-form-label double-line"><span class="require-item">*</span>计划状态：</label>
 							<div class="layui-input-block">
 								<select id="weeklyStatus" name="weeklyStatus" class="form-control simple-select required" lay-verify="">
 									<option value="0" <c:if test="${weeklyStatus eq '0' }">selected</c:if>>未完成</option>