From 07ff3e5cb589618a58c2f1c8b58b9f1305342532 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 08 六月 2023 15:04: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, 0 insertions(+), 9 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 ae54b6f..beacef8 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
@@ -11,9 +11,6 @@
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import org.apache.commons.math3.util.Precision;
-import org.aspectj.weaver.ast.Not;
-import org.ietf.jgss.Oid;
 
 import java.util.List;
 
@@ -151,15 +148,9 @@
 	private String referTypeName;
 
 	/**
-<<<<<<< Updated upstream
 	 * 鏄惁寮�鍚叏灞�
 	 */
 	private String isOpenGlobal;
-=======
-	 * 鎵�灞為鍩�
-	 */
-	private String doMain;
->>>>>>> Stashed changes
 
 	/**
 	 * 鎺掑簭

--
Gitblit v1.9.3