fan 5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev ... # Conflicts: # src/components/QueryListPage/QueryForm.vue # src/i18n/langs/en/rules.js # src/i18n/langs/en/scriptRecord.js # src/i18n/langs/zh/lesson.js # src/i18n/langs/zh/rules.js # src/i18n/langs/zh/scriptRecord.js # src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue # src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue # src/permission.js # src/router/index.js # src/utils/baseUrl.js # src/views/demonstration/detail/index.vue # src/views/display/tipExamList.vue # src/views/lesson/lessoncategory/edit/lesson/publish.vue # src/views/lesson/taskmanage/createTask.vue # src/views/lesson/trainingRule/list.vue # src/views/login/index.vue # src/views/planMonitor/editTool/statusBar.vue # src/views/scriptManage/home.vue # src/views/teach/category/tree.vue # src/views/trainRoom/index.vue		2019-10-17 09:16:40 +08:00
..
draft	desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明	2019-10-09 17:05:10 +08:00
selectRole	desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明	2019-10-09 17:05:10 +08:00
detail.vue	storage存储关联用户	2019-09-29 13:40:01 +08:00
index.vue	城市轨道实训平台调整	2019-09-27 18:02:32 +08:00