解决冲突

src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue

@@ -70,7 +70,7 @@ export default {
 						label: '产线',
 						url: '/base/production-line/listAll',
 						prop: 'productionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},
@@ -80,7 +80,7 @@ export default {
 						label: '工段',
 						url: '/base/workshop-section/listAll',
 						prop: 'sectionId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
 						bind: {
 							filterable: true,
 						},