andy
|
3b50fb3d57
|
处理忽略
|
2025-05-21 11:12:10 +08:00 |
|
andy
|
c224f391b0
|
1
|
2025-05-21 11:11:04 +08:00 |
|
andy
|
11d0576100
|
调整
|
2025-05-21 11:08:23 +08:00 |
|
andy
|
ea188d1702
|
1
|
2025-05-20 16:38:04 +08:00 |
|
lhb
|
33eddc864f
|
Merge branch 'master' of https://git.evo-techina.com/hbyt/evo-Financial-pc
# Conflicts:
# evo-admin/src/main/java/com/evo/attendance/mapper/RzAttendanceDetailMapper.java
# evo-admin/src/main/java/com/evo/attendance/mapper/RzAttendanceStatisticalMapper.java
# evo-admin/src/main/java/com/evo/attendance/service/IRzAttendanceService.java
# evo-admin/src/main/java/com/evo/attendance/service/impl/RzAttendanceServiceImpl.java
# evo-admin/src/main/java/com/evo/common/utils/poi/ExcelUtilSs.java
# evo-admin/src/main/java/com/evo/equipment/service/IEqButtonService.java
# evo-admin/src/main/java/com/evo/equipment/service/impl/EqButtonServiceImpl.java
# evo-admin/src/main/java/com/evo/finance/controller/RzSalaryDetailController.java
# evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java
# evo-admin/src/main/java/com/evo/framework/websocket/WebSocketServer.java
# evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantDetailController.java
# evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantStatisticsController.java
# evo-admin/src/main/java/com/evo/restaurant/mapper/RzRestaurantStatisticsMapper.java
# evo-admin/src/main/java/com/evo/restaurant/service/IRzRestaurantDetailService.java
# evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantDetailServiceImpl.java
# evo-admin/src/main/java/com/evo/restaurant/service/impl/RzRestaurantStatisticsServiceImpl.java
# evo-admin/src/main/java/com/evo/system/domain/SysStaffDetail.java
# evo-admin/src/main/java/com/evo/system/service/impl/SysStaffDetailServiceImpl.java
# evo-admin/src/main/java/com/evo/system/service/impl/SysStaffServiceImpl.java
# evo-admin/src/main/resources/mapper/attendance/RzAttendanceStatisticalMapper.xml
# evo-admin/src/main/resources/mapper/restaurant/RzRestaurantStatisticsMapper.xml
|
2025-05-19 16:58:46 +08:00 |
|
lhb
|
f5b1453b36
|
fix:财务管理-工资详情导出修复
|
2025-05-12 15:49:23 +08:00 |
|
lhb
|
c067f5722f
|
fix:员工管理-修改员工信息修复
|
2025-05-09 11:48:51 +08:00 |
|
lhb
|
ae29664710
|
fix:财务-餐饮管理导出统计报表
|
2025-05-09 09:22:38 +08:00 |
|
andy
|
fe7c87816a
|
新增设备链接, 刷新按钮
|
2025-05-08 10:43:43 +08:00 |
|
lhb
|
7dd42131c0
|
fix:旧系统历史数据迁移到新系统
|
2025-05-07 14:57:37 +08:00 |
|
lhb
|
d6896c1783
|
fix:打卡失败问题修复
|
2025-05-07 08:41:48 +08:00 |
|
lhb
|
d3943bad8c
|
fix:修改补卡记录同步更新考勤统计信息表
|
2025-05-05 17:32:37 +08:00 |
|
|
|
29930f98ff
|
Changes
|
2025-05-04 14:49:15 +08:00 |
|
lhb
|
948fed4a7c
|
首次提交
|
2025-05-04 11:02:42 +08:00 |
|
