Commit 0640fadc by 吕明尚

Merge branch 'dev' into test

parents 7766bf53 217a516b
......@@ -56,7 +56,7 @@ public class GiftAmountLog extends BaseEntity {
/**
* 操作时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date operationTime;
......
......@@ -55,7 +55,7 @@ public class RechargeAmountLog extends BaseEntity {
/**
* 操作时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date operationTime;
......
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