Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

# Conflicts:
#	dsk-operate-ui/src/views/macro/urban/index.vue

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -215,7 +215,6 @@ export default {
       this.querySubmit()
     },
     handleClick(){
-      console.log(this.activeName)
       this.queryParams.codeStr=[]
       this.aptitudeType='';
       this.queryParams={
@@ -267,7 +266,7 @@ export default {
     addressListbtn(data) {
       console.log(data)
       this.province=data.province;
-      this.provinceId=data.provinceId[0];
+      this.provinceId=data.provinceId[data.provinceId.length-1];
       this.dataQuery.province=data.provinces;
       let params={}
       if(data){