Merge remote-tracking branch '15git/dev3.0' into dev3.0
commit 33275779cac73b8fc045e15b155ff1d2c2d05611
2 parents 0f7aa0c + 8ce67ca
Stephanie authored on 25 Jun 2022
Showing 5 changed files
View
src/views/deviceManage/deviceModel/components/editDeviceModel.vue
View
src/views/deviceManage/deviceType/components/editDeviceType.vue
View
src/views/deviceManage/deviceType/deviceType.vue
View
src/views/wellManage/detailMapLonLat.vue
View
src/views/wellManage/editWell.vue