diff --git a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java index 6a01d42..4b69aef 100644 --- a/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java +++ b/evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java @@ -525,7 +525,7 @@ public class RzAttendanceServiceImpl extends ServiceImpl>>>>>>>>>>>>>>员工:{}, 部门:{}, 推送人员:{}, 推送结果:{}", userName, deptName, pushName, res); } } catch (Exception e) { diff --git a/evo-admin/src/main/java/com/evo/restaurant/domain/vo/RzRestaurantStatisticsExportVo.java b/evo-admin/src/main/java/com/evo/restaurant/domain/vo/RzRestaurantStatisticsExportVo.java index 6089649..becac51 100644 --- a/evo-admin/src/main/java/com/evo/restaurant/domain/vo/RzRestaurantStatisticsExportVo.java +++ b/evo-admin/src/main/java/com/evo/restaurant/domain/vo/RzRestaurantStatisticsExportVo.java @@ -64,7 +64,8 @@ public class RzRestaurantStatisticsExportVo { /** 晚餐次数 */ @Excel(name = "晚餐次数") private Long supperNumber; - + @Excel(name = "福利晚餐次数") + private Long benefitsSupperNumber; /** 晚餐个人总消费 */ @Excel(name = "晚餐个人总消费") private BigDecimal supperPreSumExpend;