From 4e6d6e7c8e4ca42e96528a71162f5e58e473f652 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/CustomerMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/CustomerMapper.xml b/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
index 951ba0e..690e89f 100644
--- a/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/CustomerMapper.xml
@@ -27,10 +27,10 @@
<result property="experience" column="experience"/>
<result property="createTime" column="create_time"/>
<result property="blackId" column="blackId"/>
-<!-- <collection property="customerTagList" ofType="cn.lili.modules.lmk.domain.vo.CustomerTagVO"-->
-<!-- select="selectTagByMemberId"-->
-<!-- column="id"-->
-<!-- />-->
+ <collection property="customerTagList" ofType="cn.lili.modules.lmk.domain.vo.MemberTagVO"
+ select="selectTagByMemberId"
+ column="id"
+ />
</resultMap>
<select id="getPage" resultMap="BaseResultMap">
@@ -69,7 +69,7 @@
ORDER BY lm.create_time DESC
</select>
- <select id="selectTagByMemberId" resultType="cn.lili.modules.lmk.domain.vo.CustomerTagVO">
+ <select id="selectTagByMemberId" resultType="cn.lili.modules.lmk.domain.vo.MemberTagVO">
SELECT
LCT.id,
LCT.tag_name,
--
Gitblit v1.8.0