Merge remote-tracking branch 'origin/master'

lin

2024-04-15 bdcca1cd1f1c4c5d7d187d74a7c75f1caac8b491

 src/main/java/org/springblade/modules/patrol/service/IPatrolGroupService.java

@@ -27,7 +27,7 @@
    * 查询巡查项树数据
    * @return
    */
    Object getPatrolGroupTree();
    Object getPatrolGroupTree(String type,String childType);

   /**
    * 获取组