ival 3bb449080f Merge remote-tracking branch 'remotes/origin/master' into dev ... # Conflicts: # src/i18n/langs/zh/tip.js # src/jlmap3d/jl3ddrive/jl3ddrive.js # src/views/components/pay/index.vue # src/views/demonstration/detail/index.vue # src/views/display/index.vue # src/views/exam/detail/courseDetail.vue # src/views/exam/detail/examDetail.vue # src/views/exam/detail/questionDetail.vue # src/views/jlmap3d/drive/jl3ddrive.vue # src/views/jlmap3d/simulation/jl3dsimulation.vue # src/views/jointTraining/index.vue # src/views/map/mapdraft/mapedit/automaticoperate/preview.vue # src/views/map/mapdraft/mapedit/mapoperate/link.vue # src/views/map/mapdraft/mapedit/mapoperate/section.vue # src/views/map/mapdraft/mapedit/mapoperate/signal.vue # src/views/map/mapdraft/mapedit/mapoperate/station.vue # src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue # src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue # src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue # src/views/map/mapdraft/mapedit/mapoperate/switch.vue # src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue # src/views/map/mapdraft/mapedit/routeoperate/detail.vue # src/views/map/mapdraft/mapedit/routeoperate/preview.vue # src/views/map/mapdraft/mapedit/routeoperate/related.vue # src/views/map/mapdraft/mapedit/routeoperate/route.vue # src/views/map/mapdraft/mapmanage/operateMenu.vue # src/views/map/product/draft.vue # src/views/map/product/list.vue # src/views/map/skinStyle/draft.vue # src/views/map/skinStyle/index.vue # src/views/planMonitor/detail.vue # src/views/planMonitor/editTool/index.vue # src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue # src/views/planMonitor/editTool/schedule.vue # src/views/teach/detail/index.vue # src/views/teach/practical/index.vue		2019-08-14 15:57:52 +08:00
..
connect	调整文件结构	2019-08-13 16:23:46 +08:00
jlmap3d.js	Merge remote-tracking branch 'remotes/origin/master' into dev	2019-08-14 15:57:52 +08:00