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

maven

6 天以前 5b83294fac4605b569a5a0d1c5e0f310026d10d4

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

@@ -33,6 +33,7 @@

    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
    private LocalDateTime createTime;

    @ApiModelProperty(value = "更新时间")