Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 {
   "TITLE": "不动产登记系统",
-  "SERVERAPI": "/bdcdj-th",
+  "SERVERAPI": "/bdcdj",
   "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0",
   "adapter": "dysqs-630222",
   "gaopaiyi": "jy"

@@ -293,10 +293,7 @@
         selectHSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
-            this.tableData.datastwo = res.result
-            this.tableData.datastwo.forEach(item => {
-              item.bsm = item.zdbsm;
-            })
+            this.tableData.datastwo = res.result;            
             this.bdcdysz = this.tableData.datastwo
           }
         })

@@ -5,7 +5,7 @@ export function queueDjywmc (djywbm, djqxbm) {
         return "selectJsydsyqSplitMerge";
     }
     // 房屋分割A04200S1
-    if (['A04300S1', 'A04200S2', 'A04300S2'].includes(djqxbm)) {
+    if (['A04300S1', 'A04200S2', 'A0830S1'].includes(djqxbm)) {
         return "selectFwfgSplitMerge";
     }
     if (djqxbm == "A37100S2") {