Merge remote-tracking branch 'origin/dev_天津_奇缘恒艺' into dev_天津_奇缘恒艺

gaoluyang

4 天以前 fc9020ef61c80338f49af4f998b15f1f8a3835fa

Merge remote-tracking branch 'origin/dev_天津_奇缘恒艺' into dev_天津_奇缘恒艺

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

@@ -6,7 +6,7 @@
    <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
        SELECT
        sam.*,
        su.user_name AS create_user_name,
        su.nick_name AS create_user_name,

        GROUP_CONCAT(DISTINCT d.dept_name ORDER BY d.dept_id SEPARATOR ',') AS department,