Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

     /**
      * 根据id查询子部门列表
      */
-    @GetMapping("/child/list/{id}")
-    public JsonResult getChildList(@PathVariable("id") String id) {
+    @GetMapping(value= {"/child/list/{id}", "/child/list"})
+    public JsonResult getChildList(@PathVariable(value="id", required=false) String id ) {
 //        log.info("进入获取子部门分页列表列表接口, id:{}", id);
         return deptService.getChildList(id);
     }