From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
index 3404797..5aba29d 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
@@ -4,6 +4,7 @@
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.CustomerTagVO;
import cn.lili.modules.member.entity.dos.Member;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +14,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @author paulG
@@ -95,6 +97,15 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
private Date createTime;
+ @ApiModelProperty(value = "瀹㈡埛鏍囩鍒楄〃")
+ private List<CustomerTagVO> customerTagList;
+
+ /**
+ * 涓簄ull鍒欎笉鍦ㄩ粦鍚嶅崟鍐�
+ */
+ @ApiModelProperty(value = "榛戝悕鍗昳d")
+ private String blackId;
+
public MemberVO(Member member) {
BeanUtil.copyProperties(member, this);
}
--
Gitblit v1.8.0