Merge remote-tracking branch 'origin/main'

# Conflicts:
#	hrm-attendance.iml
main
sy 6 months ago
commit 16e3c91ccd

@ -1,4 +0,0 @@
# attendance.attendanceAnalysis
## 考勤分析模块
## 用于计算分析人员的考勤,算出正常上下班、加班、早退、迟到等一些列考勤项目,并入到出勤结果表

@ -1,4 +0,0 @@
# attendance.attendanceAnalysis
## 考勤方案、排班管理模块
##

@ -1,4 +0,0 @@
# attendance.attendanceAnalysis
## 考勤组件模块
## person_group 人员分组功能组件
## calendar_scheduling 日历排班

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save