From 7b36013a20c3113a2d66033371d289b8da678b29 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 八月 2023 18:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
index a46d65c..4b3c4c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Combination.java
@@ -86,6 +86,12 @@
 	private String updateUser;
 
 	/**
+	 * 绉熸埛ID
+	 */
+	@ApiModelProperty(value = "绉熸埛ID")
+	private String tenantId;
+
+	/**
 	 * 鎺堟潈浜�
 	 */
 	@ApiModelProperty(value = "鎺堟潈浜�")

--
Gitblit v1.9.3