From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/domain/entity/MemberTag.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/CustomerTag.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/MemberTag.java
similarity index 72%
copy from framework/src/main/java/cn/lili/modules/lmk/domain/entity/CustomerTag.java
copy to framework/src/main/java/cn/lili/modules/lmk/domain/entity/MemberTag.java
index 3a5ae77..45c334a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/CustomerTag.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/MemberTag.java
@@ -3,21 +3,24 @@
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
- *
- *
  * @author zxl
  * @since 2025-05-14
  */
 @Data
-@TableName("lmk_customer_tag")
-public class CustomerTag extends BaseEntity {
+@TableName("lmk_member_tag")
+public class MemberTag extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    @TableField("tag_id")
+    private String tagId;
+
+    @TableField("member_id")
+    private String memberId;
+
     @TableField("tag_name")
     /**  鏍囩鍚嶇О*/
     private String tagName;

--
Gitblit v1.8.0