Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 7e5a51f911b7f65b6c37e232b69dc18c6fb6a066

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ChangeDispatch.java

@@ -44,7 +44,7 @@

    @ApiModelProperty("申请改派时间")
    @TableField("apply_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date applyTime;

    @ApiModelProperty("改派状态 (0:未改派 ;1:已改派)")