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

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.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/service/impl/DockingLogeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java
index fdfd4ea..a1e0a6b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingLogeServiceImpl.java
@@ -9,7 +9,7 @@
 /**
 	* 缂栫爜淇℃伅 鏈嶅姟瀹炵幇绫�
 	*
-	* @author xiej
+	* @author xiejun
 	* @since 2023-05-17
 	*/
 @Service

--
Gitblit v1.9.3