From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/resources/mapper/StandardTemplateMapper.xml | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
index 34a8b0e..43b380c 100644
--- a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -29,12 +29,6 @@
<select id="getStandTempIdByName" resultType="com.ruoyi.basic.pojo.StandardTemplate">
select id from standard_template where name=#{name}
</select>
- <!-- 鏌ヨ鍘嬬缉鍚庣殑鏁版嵁 -->
- <select id="selectCompressThing" resultType="java.lang.String">
- SELECT COMPRESS(thing)
- from standard_template b
- WHERE id = #{templateId}
- </select>
</mapper>
--
Gitblit v1.9.3