From c0c75703071327c172f9dfbe14f2ca47abfa10a5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:35:57 +0800
Subject: [PATCH] bug列表158（所有规则增加前缀、后缀属性，并在申请编码时进行前后缀拼接）修复；集成系统信息管理，创建修改删除，同步到用户的账号创建、删除、修改操作。

---
 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