From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:53:44 +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, 4 insertions(+), 5 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 e34545b..1341066 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
@@ -32,11 +32,10 @@
 	 */
 	private static final long serialVersionUID = 957685333614390234L;
 
-	/**
-	 * 绉熸埛ID
-	 */
-	@JSONField()
-	private String tenantId;
+//	/**
+//	 * 绉熸埛ID
+//	 */
+//	private String tenantId;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔＄被鍨�

--
Gitblit v1.9.3