diff --git a/rights-admin-controller/.gitignore b/rights-admin-controller/.gitignore index 5ff6309..54715d4 100644 --- a/rights-admin-controller/.gitignore +++ b/rights-admin-controller/.gitignore @@ -4,9 +4,12 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### +.idea/ .idea/modules.xml .idea/jarRepositories.xml .idea/compiler.xml +.idea/encodings.xml +.idea/runConfigurations.xml .idea/libraries/ *.iws *.iml @@ -35,4 +38,4 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store diff --git a/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java b/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java index 8d73e60..c6ca867 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java +++ b/rights-entity/src/main/java/com/cyjd/rights/entity/RefundOrderEntity.java @@ -3,6 +3,7 @@ package com.cyjd.rights.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -20,6 +21,7 @@ public class RefundOrderEntity { private String mobile; //退款时间 + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime refundTime; //商户订单号 对应支付表的other_order_id