joylink_cuiweidong b3a4e6ca8c Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev ... # Conflicts: # src/i18n/langs/zh/global.js		2019-11-11 13:11:50 +08:00
..
lessoncategory	调整查询地图列表接口	2019-11-08 16:22:05 +08:00
taskmanage	调整查询地图列表接口	2019-11-08 16:22:05 +08:00
trainingmanage	权限分发调整	2019-11-11 13:10:23 +08:00
trainingRule	bug 调整	2019-11-08 18:43:46 +08:00
details.vue	接口调整	2019-10-31 17:45:15 +08:00
home.vue	设计平台剧本课程运行图统一风格样式	2019-11-11 13:10:36 +08:00
operateMenu.vue	desc: 高度修改，登陆页面英文调整	2019-10-29 17:33:11 +08:00