Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -152,7 +152,7 @@ export default {
             "id": "20221025165904",
             "content": {
                 "sa_itempriceadjustid": this.$route.query.id,
-                "marketprice":this.form.oldprice1,
+                "marketprice":this.form.price1,
                 "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
                 "sa_itempriceadjust_itemprice": content
             }

src/HManagement/clueManage/m_activity/modules/selectAgent/agent/list.vue

@@ -83,7 +83,7 @@ export default {
   },
   created () {
     // 获取角色表结构
-    this.tablecols = this.tool.tabelCol(this.$route.name)['activitylist'].tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name)['peopleTable'].tablecols
   }
 }