Merge remote-tracking branch 'origin/master'

src/views/enforce/historyCheck.vue

@@ -58,7 +58,7 @@
 										<p><span class="card_box_label">执法部门：</span> {{ item.lawEnforcement }}</p>
 									</div>
 									<div class="card_box_span">
-										<p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }}</p>
+										<p><span class="card_box_label">执法人员：</span> {{ item.lawEnforcer }} , {{ item.lawEnforcerTwo }}</p>
 									</div>
 									<div class="card_box_span">
 										<p><span class="card_box_label">备注：</span> {{ item.remark }}</p>

src/views/enforce/sign.vue

@@ -16,12 +16,12 @@
                     />
                     <van-field
                       v-model="submitData.lawEnforcer"
-                      label="执法人员1"
+                      label="执法人员"
                       readonly
                     />
                     <van-field
                       v-model="submitData.lawEnforcerTwo"
-                      label="执法人员2"
+                      label="执法人员"
                       readonly
                       placeholder="请选择"
                       right-icon="add-o"

src/views/enterprise/enterpriseInspectionDetail.vue

@@ -68,7 +68,7 @@
             <van-field
                 v-model="submitData.lawEnforcerTwo"
                 readonly
-                label="执法人员2"
+                label="执法人员"
             />
             <van-field
               v-model="submitData.remark"

src/views/enterprise/registrationDetail.vue

@@ -16,12 +16,12 @@
                     />
                     <van-field
                       v-model="submitData.lawEnforcer"
-                      label="执法人员1"
+                      label="执法人员"
                       readonly
                     />
                     <van-field
                       v-model="submitData.lawEnforcerTwo"
-                      label="执法人员2"
+                      label="执法人员"
                       readonly
                       placeholder="请选择"
                       right-icon="add-o"