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

liyong

昨天 33f9eae4ad4321860e4881f5f38dad6368c878ef

 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,