feat:解决代码合并问题

2023-05-16 16:17:45 +08:00 · 2023-05-16 16:17:45 +08:00 · 6bcb4c6b0d
parent d580a6f1dc
commit 6bcb4c6b0d
1 changed files with 6 additions and 6 deletions
--- a/src/mock/layer.ts
+++ b/src/mock/layer.ts
@ -26,7 +26,7 @@ export default [ {
    color:COLOR.BOUNDS,
    selected:false,
    pages:["closePark","peopleCar"]
-}{
+},{
    name:"人员定位",
    ids:[] as string[],
    type:"moveMarker",
@ -37,7 +37,7 @@ export default [ {
    coordinateType:1,
    selected:false,
    pages:["closePark","peopleCar","smartSafetySupervision","smartEmergency"]
-}{
+},{
    name:"车辆定位",
    ids:[] as string[],
    type:"moveMarker",