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

gongchunyi

9 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

 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("备注")