From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java |    6 ++++++
 1 files changed, 6 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 8aafe40..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
@@ -100,6 +100,12 @@
     @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