e7210d3a by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents f73eb8da 6a5d2671
...@@ -557,8 +557,6 @@ ...@@ -557,8 +557,6 @@
557 this.centerDialogVisible = true; 557 this.centerDialogVisible = true;
558 }, 558 },
559 getData: function (data) { 559 getData: function (data) {
560 console.log(data,'data')
561 console.log(this.zdhbqData,'宗地合并前数据')
562 let arr=[]; 560 let arr=[];
563 switch (this.tabName) { 561 switch (this.tabName) {
564 case "zd": 562 case "zd":
......