Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

21 小时以前 7be2d271eafa48f7e7dcc8ac9d2219634b5938ef

Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

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

@@ -13,7 +13,7 @@
    </resultMap>

    <select id="listPage" resultMap="RulesRegulationsManagementDTOMap">
        select rrm.*, su.user_name as create_user_name
        select rrm.*, su.nick_name as create_user_name
        from rules_regulations_management rrm
        left join sys_user su on rrm.create_user = su.user_id
        <where>