Skip to content

G
gxpt_ht
Commit 0640fadc by 吕明尚
Options

Merge branch 'dev' into test

parents 7766bf53 217a516b
Showing with 2 additions and 2 deletions
share-system/src/main/java/share/system/domain/GiftAmountLog.java
...@@ -56,7 +56,7 @@ public class GiftAmountLog extends BaseEntity { ...@@ -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") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date operationTime; private Date operationTime;
......
share-system/src/main/java/share/system/domain/RechargeAmountLog.java
...@@ -55,7 +55,7 @@ public class RechargeAmountLog extends BaseEntity { ...@@ -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") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date operationTime; 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