diff --git a/src/utils/request.js b/src/utils/request.js
index 17fe11bf..c4850253 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,22 +10,7 @@ export const name = `OP8888`
 export const upload = `http://localhost:8411/submit/uploadFile.ashx`
 export const download = `http://localhost:8411/submit/downloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-=======
-
-  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
-  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
-
-  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫
-
-  // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index 56a3237e..050a1deb 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -538,7 +538,6 @@ export default {
     },
     addPeople() {
       if (this.id) {
-<<<<<<< HEAD
         addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
           if (response.data[0].result === '1') {
             this.i = 1
@@ -548,11 +547,9 @@ export default {
             this.$message.error('添加失败')
           }
         })
-=======
         this.people_title = '新增人员'
         this.people_DFV = true
         this.addForm('people_form')
->>>>>>> 7cdb10d153358b72f95165dd7f3a12ad7675f14d
       } else {
         this.$message.warning(`请选择部门名称`)
       }
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 8d45eb2c..23add9cb 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -222,8 +222,8 @@ export default {
         ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }]
       },
       rules2: {
-        Process: [{ required: true, message: '请输入工艺名称' }],
-        ProcessShort: [{ required: true, message: '请输入工艺名称简称' }]
+        Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }],
+        ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }]
       },
       rules3: {
         TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }]