From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突

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

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
index 0af732b..6618060 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
@@ -2,7 +2,12 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.vci.ubcs.code.dto.CodeReferConfigDTO;
+<<<<<<< Updated upstream
 import com.vci.ubcs.code.service.ICodeReferConfigService;
+=======
+import com.vci.ubcs.code.entity.CodeReferConfig;
+import com.vci.ubcs.code.service.CodeReferConfigService;
+>>>>>>> Stashed changes
 import com.vci.ubcs.code.vo.CodeReferConfigVO;
 import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import org.springblade.core.tool.api.R;
@@ -10,6 +15,10 @@
 
 import javax.annotation.Resource;
 import java.util.List;
+<<<<<<< Updated upstream
+=======
+import java.util.Map;
+>>>>>>> Stashed changes
 
 /**
  * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰

--
Gitblit v1.9.3