From 53f8b0f89dc73e08cad2a4e7a52bbb438617db10 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 05 六月 2023 18:19:33 +0800
Subject: [PATCH] 整合组件

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index 4ff4161..ae54b6f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -151,9 +151,15 @@
 	private String referTypeName;
 
 	/**
+<<<<<<< Updated upstream
 	 * 鏄惁寮�鍚叏灞�
 	 */
 	private String isOpenGlobal;
+=======
+	 * 鎵�灞為鍩�
+	 */
+	private String doMain;
+>>>>>>> Stashed changes
 
 	/**
 	 * 鎺掑簭

--
Gitblit v1.9.3