From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
index f743ebc..d7c93c7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
@@ -1,6 +1,6 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
 
 /**
  * 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁樉绀哄璞�
@@ -8,7 +8,7 @@
  * @author weidy
  * @date 2022-03-28
  */
-public class DockingLogeVO extends BaseModelVO {
+public class DockingLogeVO extends BaseModel {
 
 	/**
      * 绂佹淇敼杩欎釜鍊�

--
Gitblit v1.9.3