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

云

4 天以前 23c8604bc54ba3f20b0bf00a2649895c8e096a05

 src/main/resources/mapper/staff/PersonalShiftMapper.xml

@@ -31,9 +31,9 @@
            </if>
        </where>
        GROUP BY u.id, u.staff_name
        ORDER BY MAX(s.create_time)
        ORDER BY MAX(s.create_time) desc
    </select>
   

    <select id="performanceShiftYear" resultType="java.util.Map">
         SELECT
         u.staff_name name,