diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index d05df30..87b7d94 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -410,7 +410,10 @@
               </el-upload>-->
               <el-upload
                 :disabled="isDisabled"
+                v-model="formData.contract.file"
                 :headers="{'Token':userStore.token}"
+                class="upload-demo"
+                action="https://worker-task.lihaink.cn/adminapi/upload/file"
                 multiple
                 :limit="1"
               >
@@ -500,6 +503,7 @@ const formData = reactive({
   master_position: "",
   master_phone: "",
   master_email: "",
+
   other_contacts: [
     {
       name: "",
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 55dc714..b5b8b71 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -175,11 +175,11 @@
                 :style="{ width: '100%' }"
                 clearable
               >
-<<<<<<< HEAD
                 <el-option v-if="formData.root == 1" label="系统管理员" :value="0" />
-=======
                 <el-option
-                  label="系统管理员"
+                  v-for="(item, index) in optionsData.role"
+                  :key="index"
+                  :label="item.name"
                   :value="item.id"
                 />
               </el-select>
@@ -417,11 +417,7 @@
         </el-col>
 
         <el-col :span="24" v-if="!isCheck">
-<<<<<<< HEAD
           <el-form-item label="合同上传" prop="field127">
-=======
-          <el-form-item label="上传" prop="field127">
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
             <el-upload
               :headers="{ Token: userStore.token }"
               v-model="formData.file"
@@ -487,11 +483,8 @@ const formData = reactive({
   street: "",
   address: "",
   account: "",
-<<<<<<< HEAD
   is_contract: 0,
   // 签约方
-=======
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
   party_a_name: "",
   qualification: {
     id_card: "",
@@ -504,10 +497,6 @@ const formData = reactive({
   // 合同类型
   contract_type: "",
   file: "",
-<<<<<<< HEAD
-=======
-  is_contract: 0,
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
   role_id: "",
   avatar: "",
   multipoint_login: 1,
@@ -566,12 +555,8 @@ getcontract_type();
 const isCompany = ref(false);
 function customEvent(data: any) {
   isCompany.value = false;
-<<<<<<< HEAD
   //   formData.contract.party_a = data.id
   console.log(data);
-=======
-  // formData.contract.party_a = data.id
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
   formData.party_a_name = data.company_name;
 }
 // 表单验证
@@ -764,7 +749,6 @@ const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
 
 //获取省份
 function province_change(value: string) {
-<<<<<<< HEAD
   getCityList();
 }
 function city_change(value: string) {
@@ -772,18 +756,6 @@ function city_change(value: string) {
 }
 function area_change(value: string) {
   getStreetList();
-=======
-  formData.province = value;
-  getCityList(value);
-}
-function city_change(value: string) {
-  formData.city = value;
-  getAreaList(value);
-}
-function area_change(value: string) {
-  formData.area = value;
-  getStreetList(value);
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
 }
 function street_change(value: string) {
   formData.street = value;
@@ -792,7 +764,6 @@ const getProvinceList = async () => {
   const data = await apiProvinceList({});
   datas["provinceOptions"] = data;
 };
-<<<<<<< HEAD
 const getCityList = async () => {
   const data = await apiCityList({ city: formData.province });
   datas["cityOptions"] = data;
@@ -807,20 +778,6 @@ const getStreetList = async () => {
 };
 getProvinceList();
 
-=======
-const getCityList = async (id: any) => {
-  const data = await apiCityList({ city: id });
-  datas["cityOptions"] = data;
-};
-const getAreaList = async (id: any) => {
-  const data = await apiAreaList({ area: id });
-  datas["areaOptions"] = data;
-};
-const getStreetList = async (id: any) => {
-  const data = await apiStreetList({ street: id });
-  datas["streetOptions"] = data;
-};
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
 const setFormData = async (row: any) => {
   const data = await adminDetail({
     id: row.id,
@@ -832,16 +789,12 @@ const setFormData = async (row: any) => {
       key == "role_id"
         ? (formData[key] = data[key][0])
         : (formData[key] = data[key]);
-<<<<<<< HEAD
       if (stringArr.includes(key)) {
         formData[key] = formData[key].toString();
         getCityList();
         getAreaList();
         getStreetList();
       }
-=======
-      if (stringArr.includes(key)) formData[key] = formData[key].toString();
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
     }
   }
 };
@@ -849,11 +802,6 @@ const setFormData = async (row: any) => {
 const handleClose = () => {
   emit("close");
 };
-<<<<<<< HEAD
-=======
-getProvinceList();
-
->>>>>>> 82c01a14754236ecbefa9b1756ffcdd97dce1bb3
 defineExpose({
   open,
   setFormData,