From 824edc826c92312c150a2f0eea9bdd2bfcb82b2f Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 14:28:37 +0800
Subject: [PATCH] 冲突

---
 src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java b/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java
index 5825a16..3bd0fae 100644
--- a/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java
+++ b/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java
@@ -5,6 +5,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 
@@ -22,7 +23,7 @@
 public class CustomerPointDetail extends BaseAutoEntity {
 
     @ApiModelProperty("记录日期")
-    private Date recordDate;
+    private LocalDate recordDate;
 
     @ApiModelProperty("用户ID")
     private String userId;

--
Gitblit v1.9.3