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

gongchunyi

2026-03-05 0907687e631c643a4cf0d41c1d2d4a645e69f0a7

 src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java

@@ -63,7 +63,7 @@
    private BigDecimal workHours;

    @ApiModelProperty("状态 0正常 1迟到 2早退 3迟到早退 4缺勤")
    @Excel(name = "状态", sort = 8,readConverterExp = "0=正常,1=迟到,2=早退,3=迟到早退,4=缺勤")
    @Excel(name = "状态", sort = 8,readConverterExp = "0=正常,1=迟到,2=早退,3=迟到、早退,4=缺勤")
    private Integer status;

    @ApiModelProperty("备注")