From d5ebac1efe04615795c939fa6d6032b233bc4e79 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 七月 2024 17:34:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 45f22b4..6f33a37 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -8,8 +8,8 @@
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.util.VciBaseUtil;
 import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.model.OsAttributeDO;
-import com.vci.web.pageModel.OsAttributeVO;
+import com.vci.model.OsAttributeDO;
+import com.vci.pagemodel.OsAttributeVO;
 import com.vci.web.service.OsAttributeServiceI;
 import com.vci.web.util.PlatformClientUtil;
 import com.vci.web.util.WebUtil;
@@ -24,7 +24,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.vci.client.omd.attribpool.ui.VTDataTypePanel.*;
+//import static com.vci.client.omd.attribpool.ui.VTDataTypePanel.*;
+import static com.vci.omd.constants.AttributeConstants.*;
 
 /**
  * 灞炴�ф睜鏈嶅姟  --宸茬粡璋冪敤浜嗗钩鍙扮殑鏈嶅姟锛屽洜姝や笉鍦ㄦ彁渚汥ao灞�

--
Gitblit v1.9.3