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

ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html

@@ -200,9 +200,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-6 control-label">客户第一收货人：</label>
+            <label class="col-sm-6 control-label">客户第一联系人：</label>
             <div class="col-sm-6">
-                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly/>
+                <input name="customerContact" class="form-control" type="text" th:field="*{customerContact}" readonly/>
             </div>
         </div>
         <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html

@@ -199,9 +199,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-6 control-label">客户第一收货人：</label>
+            <label class="col-sm-6 control-label">客户第一联系人：</label>
             <div class="col-sm-6">
-                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly/>
+                <input name="customerContact" class="form-control" type="text" th:field="*{customerContact}" readonly/>
             </div>
         </div>
         <div class="form-group">