Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-03-07 d7fef91a4cbb702988dc820bcde82c166253ceec

 ard-inspection/src/main/resources/mapper/ArdInspectionGroupMapper.xml

@@ -129,7 +129,8 @@

    <select id="checkInspectionGroupNameUniqueB" resultMap="ArdInspectionGroupResult">
        <include refid="selectArdInspectionGroupVo"/>
        where group_name=#{groupName} limit 1
        where del_flag = '0'
        and group_name=#{groupName} limit 1
    </select>

    <select id="selectChildrenInspectionGroupById" parameterType="Long" resultMap="ArdInspectionGroupResult">