From e46e620ea7afd8b18aa24dde8e3c9564355fa14f Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期日, 28 九月 2025 15:14:51 +0800
Subject: [PATCH] Merge branch 'send_coupon' into user_action
---
framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 5aba29d..ced2121 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,7 +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.lmk.domain.vo.MemberTagVO;
import cn.lili.modules.member.entity.dos.Member;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
@@ -98,7 +98,7 @@
private Date createTime;
@ApiModelProperty(value = "瀹㈡埛鏍囩鍒楄〃")
- private List<CustomerTagVO> customerTagList;
+ private List<MemberTagVO> tags;
/**
* 涓簄ull鍒欎笉鍦ㄩ粦鍚嶅崟鍐�
@@ -106,6 +106,9 @@
@ApiModelProperty(value = "榛戝悕鍗昳d")
private String blackId;
+ @ApiModelProperty(value = "缁戝畾鍟嗗簵鍚�")
+ private String bindStoreName;
+
public MemberVO(Member member) {
BeanUtil.copyProperties(member, this);
}
--
Gitblit v1.8.0