Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -85,7 +85,7 @@ class business {
     })
   }
   // 注销登记
-  async getQlfQlZxdjByCondition (data) {
+  async getQlfQlZxdjList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlZxdj/getDataPage',
       method: 'post',

@@ -236,9 +236,9 @@ export const asyncRoutes = [
         meta: { title: '林权' }
       },
       {
-        path: 'cancellationReg',
-        component: () => import('@/views/business-info/cancellation-registration/index'),
-        name: 'cancellationReg',
+        path: 'zxdj',
+        component: () => import('@/views/business-info/zxdj/index'),
+        name: 'zxdj',
         meta: { title: '注销登记' }
       },
       {

@@ -105,7 +105,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlZxdjByCondition(this.form)
+        } = await business.getQlfQlZxdjList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,