Merge branch 'dev' into dev_user0622
This commit is contained in:
+9
@@ -480,4 +480,13 @@ public class StockOutOrderDO extends BaseVOEntity {
|
|||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date pushTimeTo;
|
private Date pushTimeTo;
|
||||||
|
@ApiModelProperty(value = "推送时间起")
|
||||||
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date createTimeFrom;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "推送时间止")
|
||||||
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date createTimeTo;
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user