Merge remote-tracking branch 'origin/master'

lin

2024-04-10 d3c223eaa4df46d17c138ef8ed5eab8da9638416

 src/main/java/org/springblade/modules/patrol/mapper/PatrolGroupMapper.java

@@ -21,13 +21,13 @@
    * 查询巡查项树数据
    * @return
    */
    List<TreeNode> getPatrolGroupTree();
    List<TreeNode> getPatrolGroupTree(String type);

   /**
    * 查询巡查项树数据
    * @return
    */
   List<TreeNode> getPatrolGroupItemTree();
   List<TreeNode> getPatrolGroupItemTree( String childType);

    List<PatrolGroup> getPatrolGroupByItemId(@Param("itemIds") String itemIds);