From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java
index ba9f2ac..cc8674a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/EnumCache.java
@@ -73,7 +73,6 @@
 		return getValue(name.getName(), nameChild);
 	}
 
-
 	/**
 	 * 鑾峰彇瀛楀吀鍊�
 	 *

--
Gitblit v1.9.3