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
..
examRule	Merge remote-tracking branch 'origin/dev_product' into dev	2019-10-17 09:16:40 +08:00
productStatus	增加回放的国际化	2019-08-20 17:22:45 +08:00
publishLesson	增加回放的国际化	2019-08-20 17:22:45 +08:00
publishMap	desc: 调整权限字段限制， 配置英文版登陆页面	2019-09-26 17:42:25 +08:00
runPlanCommon	剧本管理英文版英文用词修改	2019-10-16 11:20:36 +08:00
runPlanEveryDay	App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入	2019-09-02 15:37:57 +08:00
runPlanTemplate	剧本管理英文版英文用词修改	2019-10-16 11:20:36 +08:00
simulationScript	增加国际化配置	2019-08-20 17:01:09 +08:00