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

liyong

8 天以前 0e3b66ffaf4d601a2c5560bdd61a0121bea7696c

 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;
}