From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 6384c7c..9bb7b6f 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
@@ -1,5 +1,6 @@
package com.vci.ubcs.starter.revision.model;
+import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,6 +14,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
public class BaseModel implements Serializable {
@JsonSerialize(
@@ -22,12 +24,17 @@
@TableId(value = "OID",type = IdType.ASSIGN_UUID)
private String oid;
- @TableField(value = "ID")
+ @TableField(value = "id")
private String id;
private String name;
- //闆嗗洟鐮�
- private String groupcode;
+
+ /**
+ * 绉熸埛ID
+ * @TableField(value = "tenant_id")杩欓噷蹇呴』瑕佸啓锛屽苟涓斿繀椤绘槸瑕佸皬鍐欑殑
+ */
+ @TableField(value = "tenant_id")
+ private String tenantId;
private String description;
@@ -88,24 +95,24 @@
)
private Date ts;
+ /**
+ * 鎵�鏈夌潃
+ */
private String owner;
private String copyFromVersion;
- // @VciUseEnum(
-// value = "Enumsecretgrade",
-// showTextField = "secretGradeText"
-// )
+ /**
+ * 闇�瑕佷娇鐢ㄥ瘑绾х殑鏃跺�欙紝闇�瑕佺户鎵胯繖涓睘鎬�
+ */
@TableField(exist = false)
private Integer secretGrade;
- @Transient
@TableField(exist = false)
private String secretGradeText;
- @Transient
@TableField(exist = false)
- private Map<String, String> data;
+ private Map<String, String> data = new HashMap<>();
public BaseModel() {
}
@@ -342,12 +349,12 @@
this.lctid = lctid;
}
- public String getGroupcode() {
- return this.groupcode;
+ public String getTenantId() {
+ return tenantId;
}
- public void setGroupcode(String groupcode) {
- this.groupcode = groupcode;
+ public void setTenantId(String tenantId) {
+ this.tenantId = tenantId;
}
public Map<String, String> getData() {
@@ -360,7 +367,7 @@
@Override
public String toString() {
- return "BaseModel{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lctid='" + this.lctid + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", data=" + this.data + '}';
+ return "BaseModel{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lctid='" + this.lctid + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", data=" + this.data + '}' + '\'' + ", tenantId=" + this.tenantId + '}';
}
}
--
Gitblit v1.9.3