Commit Graph

4 Commits

Author SHA1 Message Date
zyy
12f283cbae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue
2020-03-18 09:12:18 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
3beb346ce1 功能按钮代码调整 2020-03-17 18:59:51 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00