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-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java index 041cc62..c8c9754 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java +++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java @@ -32,7 +32,7 @@ * 绉熸埛ID * @TableField(value = "tenant_id")杩欓噷蹇呴』瑕佸啓锛屽苟涓斿繀椤绘槸瑕佸皬鍐欑殑 */ - @TableField(value = "tenant_id",exist = false) + @TableField(value = "tenant_id") private String tenantId; private String description; -- Gitblit v1.9.3