From f02c15e434ffbc248b55d9d14e104c7d8556062b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 28 四月 2023 11:42:42 +0800
Subject: [PATCH] 1、主要完成主题库定义的模板分类的接口移植。 2、主要对界面字数多了换行问题进行了修改。

---
 Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
index 6c99277..9e92da4 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
@@ -1,10 +1,19 @@
 package com.vci.ubcs.ddl.processor.dll;
 
+<<<<<<< HEAD
+=======
 import com.vci.starter.web.enumpck.VciFieldTypeEnum;
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
 import com.vci.ubcs.ddl.mapper.DllMapper;
 import com.vci.ubcs.ddl.mapper.DllOracleMapper;
 import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
+<<<<<<< HEAD
+import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
+=======
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;

--
Gitblit v1.9.3