Merge remote-tracking branch 'origin/master'

lin

2024-04-13 5497dd57b68dd7ef0ec5844e5f8c0816f7048f25

 src/main/java/org/springblade/modules/patrol/controller/PatrolGroupController.java

@@ -130,8 +130,8 @@
    */
   @ApiOperation(value = "查询巡查项树数据", notes = "查询巡查项树数据")
   @GetMapping(value = "/getPatrolGroupTree")
   public R getPatrolGroupTree() {
      return R.data(patrolGroupService.getPatrolGroupTree());
   public R getPatrolGroupTree(@RequestParam(value = "type",required = false)String type,@RequestParam(value = "childType",required = false)String childType) {
      return R.data(patrolGroupService.getPatrolGroupTree(type,childType));
   }

   /**