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/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
index feb76f2..d6f36c1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
@@ -19,12 +19,6 @@
StandardTemplate getStandTempIdByName(String name);
- /**
- * 鏌ヨ鍘嬬缉鍚庣殑鏁版嵁
- * @param templateId
- * @return
- */
- String selectCompressThing(Integer templateId);
}
--
Gitblit v1.9.3