Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -642,6 +642,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         }else {
                             staffStat.setAttendanceSummary(staffStatTemp.getAttendanceSummary() + attendanceSummary);
                         }
+                        staffStat.setRemark(staffStatTemp.getRemark());
                         updateStaffStat.add(staffStat);
                     } else {
                         staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));