From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突

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

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/PreApplyCodeOrderDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/PreApplyCodeOrderDTO.java
index a56fef7..18bedae 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/PreApplyCodeOrderDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/PreApplyCodeOrderDTO.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.dto;
 
-import com.vci.web.dto.BaseModelDTO;
+
+import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
 
 import java.util.List;
 

--
Gitblit v1.9.3