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

# Conflicts:
#	src/views/zd/zddcb/index.vue

@@ -241,7 +241,6 @@ export default {
 	methods: {
 	    // 重置
 	    reset(){
-			debugger
 			if(this.$refs['ruleForm']){
             	this.$refs['ruleForm'].resetFields();
 			}

@@ -349,7 +349,6 @@
 <script>
 import Qlr from "../../../components/formMenu/qlr";
 import Qlxz from "../../../components/formMenu/qlxz";
-//import {submit} from "../../../api/common"
 import geoUtils from "@components/lineTree/tx/js/geoUtils";
 import {
 	getAllList,