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-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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..4ff4161 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,9 @@
 	private String referTypeName;
 
 	/**
-	 * 鎵�灞為鍩�
+	 * 鏄惁寮�鍚叏灞�
 	 */
-	private String doMain;
+	private String isOpenGlobal;
 
 	/**
 	 * 鎺掑簭
@@ -161,6 +161,11 @@
 	private Integer orderNum;
 
 	/**
+	 * 鏄惁寮�鍚寔涔呭寲
+	 */
+	private String isPersistence;
+
+	/**
 	 * 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
 	 */
 	@TableField(exist = false)

--
Gitblit v1.9.3