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

project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue

@@ -10,7 +10,7 @@
             <el-button type="primary" :disabled="!ids.toString()" @click="batchAllot">功能分配</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="搜索姓名、手机号" v-model="search.name" clearable
+            <el-input size="small" placeholder="搜索姓名、手机号" v-model="search.condition" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
@@ -137,7 +137,7 @@ export default {
       dialogForm: {},
       optionsParty: [],
       tableData: [],
-      search: {name: ""},
+      search: {condition: ""},
       ids: [],
       lock: false,
       accountDialog: false,

project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue

@@ -81,7 +81,7 @@ export default {
     },
     handleCancel() {
       this.$confirm("是否要取消本次融资需求发布?").then(() => {
-        this.instance.post("/appfinancingdemand/userCancel", null, {
+        this.instance.post("/appfinancingdemand/cancelObtain", null, {
           params: {id: this.detail.id}
         }).then(res => {
           if (res.code == 0) {