Merge remote-tracking branch 'origin/master'

maven

3 天以前 54441b789704a6ca10247fe44b342801d8a14353

 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>