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/vue.config.js

@@ -35,6 +35,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://47.104.91.229:9099/prod-api`,
+        // target: `http://122.9.160.122:9011`,
         // target: `http://192.168.60.126:9011`,
         // target: `http://192.168.60.27:8766`,
         changeOrigin: true,