From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
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