Merge remote-tracking branch 'refs/remotes/origin/dev_New' into jtwy

liyong

2026-02-04 69bb4a6479653f2e27cb67ce0ab817bd40e9c791

 src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml

@@ -17,6 +17,9 @@
        from rules_regulations_management rrm
        left join sys_user su on rrm.create_user = su.user_id
        <where>
            <if test="ew.regulationNum != null and ew.regulationNum != ''">
                and rrm.regulation_num = #{ew.regulationNum}
            </if>
            <if test="ew.title != null and ew.title != ''">
                and rrm.title like concat('%',#{ew.title},'%')
            </if>