zyy 22beeffc53 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev ... # Conflicts: # src/utils/baseUrl.js # src/views/screenMonitor/list/demonList.vue		2019-08-30 17:03:51 +08:00
..
detail	Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev	2019-08-30 17:03:51 +08:00
list	修改代码格式以及操作的bug	2019-08-29 10:33:50 +08:00
home.vue	国际化调整	2019-08-22 09:06:48 +08:00
index.vue	修改代码格式以及操作的bug	2019-08-29 10:33:50 +08:00
result.vue	修改导航配置	2019-08-14 10:36:55 +08:00