From 249ef0d4a5b5011927d1b73ad7e05284258ec11a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 九月 2023 11:07:58 +0800
Subject: [PATCH] 代码冲突，整合代码

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
index 78c532e..6979efd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -32,8 +32,6 @@
 	 */
 	List<CodeClassify> selectByWrapper(Wrapper wrapper);
 
-
-
 	/**
 	 * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
 	 * @param wrapper 鏌ヨ灏佽鍣�
@@ -41,11 +39,6 @@
 	 */
 	List<String> select1(Wrapper wrapper);
 
-
-
-
-
-
 	/**
 	 * 鑷畾涔夊垎椤�
 	 *

--
Gitblit v1.10.0