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

src/views/potentialSafety/data.ts

@@ -192,8 +192,8 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         { label: '责任人一',
           value: '责任人一', },
-        { label: '责任人一',
-          value: '责任人一', },
+        { label: '责任人二',
+          value: '责任人二', },
       ],
       placeholder: '责任人',
     },

src/views/safetyEducation/data.ts

@@ -90,7 +90,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '学时(合计)',
+    label: '学识(合计)',
     labelWidth: '140px',
     field: 'knowledge',
     required: true,