From fa71b7aa27b81d6dde8e870da34f9b64d685df4b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 19 九月 2025 14:19:56 +0800
Subject: [PATCH] Merge branch 'dev' into user_action

---
 framework/src/main/java/cn/lili/modules/member/entity/vo/MemberExportVO.java |  127 ++++++++++++++++++++++++++++++++++++++++++
 framework/src/main/java/cn/lili/modules/lmk/domain/entity/MerchantTag.java   |   43 ++++++++++++++
 2 files changed, 170 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/MerchantTag.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/MerchantTag.java
new file mode 100644
index 0000000..d060324
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/MerchantTag.java
@@ -0,0 +1,43 @@
+package cn.lili.modules.lmk.domain.entity;
+
+import cn.lili.modules.lmk.enums.general.MerchantTagTypeEnums;
+import cn.lili.modules.lmk.enums.general.MerchantVisibilityEnums;
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 鍟嗘埛鏍囩
+ *
+ * @author peng
+ * @since 2025-09-16
+ */
+@Data
+@TableName("lmk_merchant_tag")
+public class MerchantTag extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("tag_code")
+    /** 鏍囩缂栫爜 */
+    private String tagCode;
+
+    @TableField("tag_name")
+    /** 鏍囩鍚嶇О */
+    private String tagName;
+
+    @TableField("merchant_visibility")
+    /** 鏄惁鍟嗘埛鍙
+     * @see MerchantVisibilityEnums
+     * */
+    private String merchantVisibility;
+
+    @TableField("tag_type")
+    /** 鏍囩绫诲瀷
+     * @see MerchantTagTypeEnums
+     * */
+    private String tagType;
+
+
+}
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberExportVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberExportVO.java
new file mode 100644
index 0000000..7b42f9d
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberExportVO.java
@@ -0,0 +1,127 @@
+package cn.lili.modules.member.entity.vo;
+
+import cn.lili.common.enums.ClientTypeEnum;
+import cn.lili.common.security.sensitive.Sensitive;
+import cn.lili.common.security.sensitive.enums.SensitiveStrategy;
+import cn.lili.common.utils.BeanUtil;
+import cn.lili.modules.lmk.domain.vo.MemberTagVO;
+import cn.lili.modules.member.entity.dos.Member;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author paulG
+ * @since 2021/11/8
+ **/
+@Data
+@NoArgsConstructor
+public class MemberExportVO implements Serializable {
+
+    private static final long serialVersionUID = 1810890757303309436L;
+
+    @ApiModelProperty(value = "鍞竴鏍囪瘑", hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "浼氬憳鐢ㄦ埛鍚�")
+    private String username;
+
+    @ApiModelProperty(value = "鏄电О")
+
+    private String nickName;
+
+    @ApiModelProperty(value = "浼氬憳鎬у埆,1涓虹敺锛�0涓哄コ")
+    private String sex;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "浼氬憳鐢熸棩")
+    private String birthday;
+
+    @ApiModelProperty(value = "浼氬憳鍦板潃ID")
+    private String regionId;
+
+    @ApiModelProperty(value = "浼氬憳鍦板潃")
+    private String region;
+
+    @ApiModelProperty(value = "鎵嬫満鍙风爜", required = true)
+    private String mobile;
+
+    @ApiModelProperty(value = "绉垎鏁伴噺")
+    private String point;
+
+    @ApiModelProperty(value = "绉垎鎬绘暟閲�")
+    private String totalPoint;
+
+    @ApiModelProperty(value = "浼氬憳澶村儚")
+    private String face;
+
+    @ApiModelProperty(value = "浼氬憳鐘舵��")
+    private String disabled;
+
+    @ApiModelProperty(value = "鏄惁寮�閫氬簵閾�")
+    private String haveStore;
+
+    @ApiModelProperty(value = "搴楅摵ID")
+    private String storeId;
+
+    @ApiModelProperty(value = "openId")
+    private String openId;
+
+    /**
+     * @see ClientTypeEnum
+     */
+    @ApiModelProperty(value = "瀹㈡埛绔�")
+    private String clientEnum;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鏈�鍚庝竴娆＄櫥褰曟椂闂�")
+    private String lastLoginDate;
+
+    @ApiModelProperty(value = "浼氬憳绛夌骇ID")
+    private String gradeId;
+
+    @ApiModelProperty(value = "缁忛獙鍊兼暟閲�")
+    private String experience;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+    private String createTime;
+
+    @ApiModelProperty(value = "瀹㈡埛鏍囩鍒楄〃")
+    private String tags;
+
+    /**
+     * 涓簄ull鍒欎笉鍦ㄩ粦鍚嶅崟鍐�
+     */
+    @ApiModelProperty(value = "榛戝悕鍗昳d")
+    private String blackId;
+
+    public MemberExportVO(Member member) {
+        BeanUtil.copyProperties(member, this);
+    }
+
+    public String getRegionId() {
+        return getDefaultValue(regionId);
+    }
+
+    public String getRegion() {
+        return getDefaultValue(region);
+    }
+
+    /**
+     * JSON杞崲涓殑null 浼氳浆鎴� "null"
+     * @param value
+     * @return
+     */
+    private String getDefaultValue(String value){
+        return (value == null || "null".equals(value)) ? "" : value;
+    }
+}

--
Gitblit v1.8.0