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

liyong

7 天以前 936f4bd8b7837051ff63773be6d2d9c4b402b168

 src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java

@@ -40,4 +40,7 @@
    @JsonFormat(pattern = "HH:mm")
    @DateTimeFormat(pattern = "HH:mm")
    private LocalTime  endAt;

    //班次
    private String shift;
}