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

---
 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
index 2ded4e0..6b81915 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/utils/CommonUtil.java
@@ -23,4 +23,8 @@
  */
 public class CommonUtil {
 
+
+
+
+
 }

--
Gitblit v1.9.3