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

buhuazhen

7 天以前 306a7bb0c562a97b52bbc411774303ccf5f07374

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

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

    @ApiModelProperty("班次")
    private String shift;
}