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

peng

2025-07-07 b83b070dc8cc823c877aa3a2ade134272ec0641a

 framework/src/main/java/cn/lili/modules/lmk/domain/entity/MemberTag.java

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
File was copied from framework/src/main/java/cn/lili/modules/lmk/domain/entity/CustomerTag.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;