From 6cd820835b3e65076b7925ca9a698161a763f918 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:59:58 +0800
Subject: [PATCH] 解决代码冲突

---
 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowManagerController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowManagerController.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowManagerController.java
index ea24050..6c41ebc 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowManagerController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowManagerController.java
@@ -63,7 +63,6 @@
 		return R.data(pages);
 	}
 
-
 	/**
 	 * 鍙樻洿娴佺▼鐘舵��
 	 *

--
Gitblit v1.9.3