Merge branches 'master' and 'v2.0' of https://gitlab.geexek.com.cn/micro_app/gk into v2.0

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -1138,4 +1138,15 @@ public class MicroApiController {
         FuncSetting settingByCmptId = funcSettingService.getSettingByCmptId(cmptId);
         return Result.success().setContent(settingByCmptId);
     }
+
+    /**
+     * 根据赛事Id获取项目列表
+     * @param cmptId
+     * @return
+     */
+    @GetMapping(value = "/getRoadIdsByCmptId/{cmptId}")
+    public Result getRoadIdsByCmptId(@PathVariable("cmptId") Integer cmptId) {
+        List<Road> list = roadService.queryRoads(cmptId);
+        return Result.success().setContent(list);
+    }
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java

@@ -134,4 +134,5 @@ public class RoadController {
         RoadGpsPoint gps = roadService.getGps(roadId);
         return Result.success().setContent(gps);
     }
+
 }