Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/SectionController.java

@@ -72,8 +72,8 @@ public class SectionController {
      * @param roadId
      * @return
      */
-    @GetMapping("/list/by/road/dept/{roadId}/{deptId}")
-    public JsonResult getListByRoadIdAndDeptId(@PathVariable("roadId") String roadId, @PathVariable("deptId") String deptId) {
+    @GetMapping(value = {"/list/by/road/dept/{roadId}","/list/by/road/dept/{roadId}/{deptId}"})
+    public JsonResult getListByRoadIdAndDeptId(@PathVariable(value = "roadId") String roadId, @PathVariable(required = false) String deptId) {
         return sectionService.getListByRoadIdAndDeptId(roadId, deptId);
     }