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/service/ICodeWupinService.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java
index 3eb30ee..0b9c26b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java
@@ -17,9 +17,8 @@
 package com.vci.ubcs.code.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodeWupinEntity;
+import com.vci.ubcs.code.entity.CodeWupin;
 import com.vci.ubcs.code.vo.CodeWupinVO;
-import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
@@ -28,7 +27,7 @@
  * @author yuxc
  * @since 2023-05-05
  */
-public interface ICodeWupinService extends IService<CodeWupinEntity> {
+public interface ICodeWupinService extends IService<CodeWupin> {
 
 	/**
 	 * 鑷畾涔夊垎椤�

--
Gitblit v1.9.3