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

yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml

@@ -278,7 +278,7 @@
                     a.DELETE_FLAG = 0
                     and	a.SETTLEMENT_MONTH = #{settleMonth}
                     AND s.STATUS IN (3, 4)
-                    GROUP BY a.EMP_IDCARD,a.SALARY_DATE
+                    GROUP BY a.EMP_IDCARD,a.SALARY_DATE,a.DEPT_ID
                 ) b
             WHERE b.salary_base > b.actual_salary
     </select>