-
# Conflicts: # src/views/system/account/AccountModal.vue
-
联调场景联动接口完成 feat:站内通知前端页面完成，接口调了4个 See merge request huang/yun-teng-iot-front!14
-
fix:首页开发,OEM定制开发 See merge request huang/yun-teng-iot-front!13
-
'fix:更新地理位置页面以及修复设备位置bug' See merge request huang/yun-teng-iot-front!12
-
# Conflicts: # src/api/sys/menu.ts # src/views/system/menu/index.vue # src/views/system/password/index.vue # yarn.lock
-
设备配置页面开发_11.29 See merge request huang/yun-teng-iot-front!9
-
'feat:(设备页面功能及接口调试)' See merge request huang/yun-teng-iot-front!8
-
Conflicts: .env.development src/views/system/role/RoleDrawer.vue yarn.lock
-
设备页面开发 See merge request huang/yun-teng-iot-front!6
-
feat(frontend):新增场景联动前端页面 See merge request huang/yun-teng-iot-front!4
-
# Conflicts: # .env.development # src/views/device/config.data.ts # src/views/device/index.vue # src/views/system/role/RoleDrawer.vue
-
Sqy dev远程分支与main合并 See merge request huang/yun-teng-iot-front!2