From f6b6ea193719ef3e72baf0e140dbd63ad5b83bff Mon Sep 17 00:00:00 2001
From: zhangxp <zhangxp@chicecm.com>
Date: 星期五, 26 五月 2023 18:23:52 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
index 8abd472..d808be2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
@@ -1,18 +1,18 @@
package com.vci.ubcs.omd.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import lombok.ToString;
-import org.springblade.core.mp.base.BaseEntity;
import org.springframework.data.annotation.Transient;
import javax.validation.constraints.NotNull;
+import java.io.Serializable;
import java.util.Date;
@@ -24,33 +24,34 @@
*/
@Data
@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
@TableName("pl_omd_attribute")
@ApiModel(value = "灞炴�у璞�", description = "灞炴�у璞�")
-public class Attribute extends BaseEntity {
+public class Attribute implements Serializable {
/**
* 搴忓垪鍖�
*/
private static final long serialVersionUID = -6792640675358002410L;
/**
- * 绉熸埛ID
+ * 涓婚敭
*/
- @ApiModelProperty(value = "绉熸埛ID")
- private String tenantId;
+ @ApiModelProperty(value = "涓婚敭")
+ @NotNull
+ @TableId
+ private String oid;
/**
* 瀛楁缂栧彿
*/
@ApiModelProperty(value = "瀛楁缂栧彿")
@NotNull
- private String key;
+ private String id;
/**
* 瀛楁鍚嶇О
*/
@ApiModelProperty(value = "瀛楁鍚嶇О")
- private String label;
+ private String name;
/**
* 灞炴�х被鍨嬪瓧鍏哥爜
@@ -126,7 +127,7 @@
*/
@ApiModelProperty("鍙傜収鐨勪富閿�")
@JsonSerialize(using = ToStringSerializer.class)
- private Long referToId;
+ private String referToId;
/**
* 鍙傜収瀵硅薄鐨勫悕绉�
@@ -184,4 +185,41 @@
@Transient
@TableField(exist = false)
private String calculateValue;
+
+ /**
+ * 涓氬姟绫诲瀷鍚嶇О
+ */
+ @ApiModelProperty("涓氬姟绫诲瀷鍚嶇О")
+ private String btmName;
+
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty("鎷ユ湁鑰�")
+ private String owner;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty("鍒涘缓浜�")
+ private String creator;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ /**
+ * 鏈�鍚庝慨鏀逛汉
+ */
+ @ApiModelProperty("鏈�鍚庝慨鏀逛汉")
+ private String lastModifier;
+
+ /**
+ * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
+ */
+ @ApiModelProperty("鏈�鍚庝慨鏀规椂闂�")
+ private Date lastModifyTime;
+
}
--
Gitblit v1.9.3