Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/templates/admin/company/stock_land/approve_pass_list.html

@@ -35,7 +35,7 @@
                 <div class="f-l mr-10" style="width: 100px;">
                     <span class="select-box">
                     <select th:id="searchApplyUserType" class="select" th:name="applyUserType" >
-                        <option value="">--全部--</option>
+                        <option value="">--请选择申请类型--</option>
                         <option value="3" th:selected ="${applyUserType}==3" >企业申请</option>
                         <option value="4" th:selected ="${applyUserType}==4" >街道代理</option>
                     </select>

src/main/resources/templates/admin/company/stock_land/approve_select_list.html

@@ -28,14 +28,14 @@
             <div class="f-l" style="margin-bottom: 10px;">
                 <span class="select-box" style="width:170px; margin-right:10px;">
                     <select th:id="searchApplyUserType" class="select" th:name="applyUserType" >
-                        <option value="">--全部--</option>
+                        <option value="">--请选择申请类型--</option>
                         <option value="3" th:selected ="${applyUserType}==3" >企业申请</option>
                         <option value="4" th:selected ="${applyUserType}==4" >街道代理</option>
                     </select>
 				</span>
 	            <span class="select-box" style="width:170px; margin-right:10px;">
 	                <select id="searchApplyStatus" class="select" name="approve_status">
-	                    <option value="">--全部--</option>
+	                    <option value="">--请选择审批状态--</option>
 	                     <option value="" th:each="item : ${approveItemList}" th:value="${item.value}"
 	                             th:text="${item.name}" th:selected = "${approve_status == item.value}">
 	                    </option>

src/main/resources/templates/admin/government/areaManager/index1.html

@@ -23,7 +23,7 @@
     <div class="text-c">
     		<span class="select-box" style="width:250px">
                 <select th:id="searchApplyUserType" class="select" th:name="applyUserType" onChange="$('#myForm').submit();">
-                    <option value="">--全部--</option>
+                    <option value="">--请选择申请类型--</option>
                     <option value="3" th:selected ="${searchCondition.applyUserType}==3" >企业申请</option>
                     <option value="4" th:selected ="${searchCondition.applyUserType}==4" >街道代理</option>
                 </select>