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

project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue

@@ -190,7 +190,7 @@ export default {
       this.dialog = true
       this.dialogForm = JSON.parse(JSON.stringify({
         ...row,
-        sysUserIds: [row.sysUserId],
+        sysUserIds: [row.id],
         areaId: row.areaId || this.user.info.areaId
       }));
     },
@@ -214,7 +214,7 @@ export default {
         if (v) {
           if (this.lock) return this.$message.error("请勿多次提交!")
           this.lock = true
-          this.instance.post("/user/edit", this.dialogForm).then(res => {
+          this.instance.post("/user/empower", this.dialogForm).then(res => {
             this.lock = false
             if (res?.code == 0) {
               this.dialog = false;

project/xiushan/apps/finance/AppFinanceProduct/productList.vue

@@ -13,7 +13,7 @@
                        @change="page.current=1,getTableData()"/>
           </template>
           <template #right>
-            <el-input size="small" placeholder="搜索产品名称" v-model="search.name" clearable
+            <el-input size="small" placeholder="搜索产品名称" v-model="search.productName" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
@@ -68,7 +68,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {productName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [