From f2e8b17c7df35a8efb3b32d821bea54775b253ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 15 六月 2023 21:22:40 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
index 695bc04..8dc780f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
@@ -4,8 +4,8 @@
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.vci.ubcs.code.vo.webserviceModel.attrmap.LibraryDO;
+import com.vci.ubcs.code.webService.config.AttributeMapConfig;
 import com.vci.ubcs.starter.util.LocalFileUtil;
-import com.vci.ubcs.webservice.config.AttributeMapConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Map;

--
Gitblit v1.9.3