Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

# Conflicts:
#	src/graphic/Renderer/Draw.js

src/graphic/Service/CurveRoadService.js

@@ -232,7 +232,7 @@ export default class CurveRoadService extends RoadService {
           rightLanes[i][j].x = points[j].x + rightdx1 * (i + 1);
           rightLanes[i][j].y = points[j].y + rightdy1 * (i + 1);
         } else if (j == points.length - 1) {
-          rightLanes[i][j].x = points[j].x + rightdy2 * (i + 1);
+          rightLanes[i][j].x = points[j].x + rightdx2 * (i + 1);
           rightLanes[i][j].y = points[j].y + rightdy2 * (i + 1);
         } else {
           let edgePoints1 = mathUtil.RectangleVertex(