Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

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

@@ -53,6 +53,7 @@
                group_id = spg.id and is_deleted = 0
        ) AS "has_children"
        FROM jczz_patrol_group spg where spg.is_deleted = 0
        order by spg.create_time desc
    </select>

    <!--查询巡查项树数据-->
@@ -63,6 +64,7 @@
            spgi.group_id as parentId,
            false AS hasChildren
        FROM jczz_patrol_group_item spgi where spgi.is_deleted = 0
        order by spgi.create_time desc
    </select>
    <select id="getPatrolGroupByItemId" resultType="org.springblade.modules.patrol.entity.PatrolGroup">
        SELECT distinct b.ID,b.NAME FROM