diff --git a/.env.production b/.env.production
index 51d591827..e48e69d8f 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,13 @@
 NODE_ENV = 'production'
 
 # base api
+<<<<<<< HEAD
 VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
 VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
 VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+=======
+VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
+VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
+VUE_APP_UPLOAD_API = 'https://joylink.club/jlfile/'
+>>>>>>> 151251a693a5357d34c7ebac16387ad54091622e
 VUE_APP_BASE_SITE='https://joylink.club/cbtc'
diff --git a/.env.staging b/.env.staging
index 789da186f..368935361 100644
--- a/.env.staging
+++ b/.env.staging
@@ -3,6 +3,11 @@ NODE_ENV = 'test'
 
 # base api
 VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
+<<<<<<< HEAD
 VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
 VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
+=======
+VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
+VUE_APP_UPLOAD_API = 'https://joylink.club/jlfile/'
+>>>>>>> 151251a693a5357d34c7ebac16387ad54091622e
 VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'
diff --git a/src/jlmap3d/utils/pathfinder/Pathfinding.js b/src/jlmap3d/utils/pathfinder/Pathfinding.js
index be7925f58..9844d64be 100644
--- a/src/jlmap3d/utils/pathfinder/Pathfinding.js
+++ b/src/jlmap3d/utils/pathfinder/Pathfinding.js
@@ -29,7 +29,7 @@ class Pathfinding {
 			// not-recommended these days, so go ahead and start warning.
 			console.warn('[three-pathfinding]: Use BufferGeometry, not Geometry, to create zone.');
 		} else {
-			geometry = new Geometry().fromBufferGeometry(geometry);
+			geometry = new THREE.Geometry().fromBufferGeometry(geometry);
 		}
 
 		return Builder.buildZone(geometry);
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index d0ea3ea60..040904a76 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -140,7 +140,7 @@ export default {
             return (this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy');
         },
         isStationSupervisor() {
-            return this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy');
+            return (this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy')) || this.project === 'gzb';
         },
         isDriver() {
             return this.userRole == 'DRIVER' && !this.$route.query.projectDevice;