From 93e2df19d543dbf2cd806ab205efd20be9f71111 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 06 六月 2023 16:48:00 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 2be97e5..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,22 +2,23 @@
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.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
+<<<<<<< Updated upstream
+=======
import java.util.Map;
+>>>>>>> Stashed changes
/**
* 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰
@@ -33,7 +34,7 @@
* 鏈嶅姟瀵硅薄
*/
@Resource
- private CodeReferConfigService codeReferconfigService;
+ private ICodeReferConfigService codeReferconfigService;
/**
* 鍒嗛〉鏌ヨ
--
Gitblit v1.9.3