记得上下班打卡 | git大法好,push需谨慎

Commit 0830421d authored by jiangxiulong's avatar jiangxiulong

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

parents a08cab2d 6581cbb5
...@@ -30,7 +30,7 @@ public class AnticipateValueVo implements Cloneable { ...@@ -30,7 +30,7 @@ public class AnticipateValueVo implements Cloneable {
@ApiModelProperty(value = "预约结束时间") @ApiModelProperty(value = "预约结束时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime aboutEndDate; private LocalDateTime aboutEndDate;
@ApiModelProperty("预约状态(0:未开始,1:可预约,3:已结束)") @ApiModelProperty("预约状态(0:未开始,1:可预约,2:已结束)")
private Integer state; private Integer state;
@ApiModelProperty("预约规则") @ApiModelProperty("预约规则")
private String rule; private String rule;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment