From 76695c351a2a1a1cb09fedcdd1459c02c49b489d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 19 五月 2025 18:05:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/resources/mapper/lmk/CustomerTagRefMapper.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/framework/src/main/resources/mapper/lmk/CustomerTagRefMapper.xml b/framework/src/main/resources/mapper/lmk/CustomerTagRefMapper.xml
index 0c00489..b6dbbef 100644
--- a/framework/src/main/resources/mapper/lmk/CustomerTagRefMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/CustomerTagRefMapper.xml
@@ -8,7 +8,6 @@
         <result column="customer_tag_id" property="customerTagId" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
-        <result column="delete_flag" property="deleteFlag" />
     </resultMap>
 
     <select id="getById" resultMap="BaseResultMap">

--
Gitblit v1.8.0