From 2bfad65f3f4ed0282f53e3ae01fc10c879a734bc Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 09 十一月 2023 10:03:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java | 9 --------- 1 files changed, 0 insertions(+), 9 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 6618060..0af732b 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,12 +2,7 @@ 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; @@ -15,10 +10,6 @@ import javax.annotation.Resource; import java.util.List; -<<<<<<< Updated upstream -======= -import java.util.Map; ->>>>>>> Stashed changes /** * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰 -- Gitblit v1.9.3