czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java
This commit is contained in:
张松
2025-10-15 15:28:37 +08:00
parent 261ddda88a 819c6c1749
commit 7d28f42fba
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkBirthdayGiftRecord.java
View File

@@ -1,22 +1,21 @@
package com.czg.market.entity; package com.czg.market.entity;
import com.alibaba.fastjson2.annotation.JSONField;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.sql.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.io.Serial;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
/** /**
* 生日有礼记录 实体类。 * 生日有礼记录 实体类。
* *
@@ -47,6 +46,7 @@ public class MkBirthdayGiftRecord implements Serializable {
/** /**
* 生日 * 生日
*/ */
@JSONField(format = "yyyy-MM-dd")
private LocalDate birthday; private LocalDate birthday;
/** /**
* 创建时间 * 创建时间