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

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java |   11 +++++++++++
 1 files changed, 11 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 30c4034..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
 
 	/**
 	 * 鎺掑簭
@@ -161,6 +167,11 @@
 	private Integer orderNum;
 
 	/**
+	 * 鏄惁寮�鍚寔涔呭寲
+	 */
+	private String isPersistence;
+
+	/**
 	 * 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
 	 */
 	@TableField(exist = false)

--
Gitblit v1.9.3