From eea8f33cf98f58026e93b209432553e5b1c03da2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 七月 2021 19:44:18 +0800
Subject: [PATCH] 发布 v2.5.2 bug修复版
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index 737966a..c98f9fc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -11,7 +11,10 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 瀛楀吀鏁版嵁琛� sys_dict_data
@@ -23,13 +26,13 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_dict_data")
-public class SysDictData
+public class SysDictData implements Serializable
{
private static final long serialVersionUID = 1L;
/** 瀛楀吀缂栫爜 */
@Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
- @TableId(value = "dept_code",type = IdType.AUTO)
+ @TableId(value = "dict_code",type = IdType.AUTO)
private Long dictCode;
/** 瀛楀吀鎺掑簭 */
@@ -70,6 +73,7 @@
private String status;
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@@ -78,6 +82,7 @@
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@@ -88,6 +93,12 @@
/** 澶囨敞 */
private String remark;
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
public boolean getDefault()
{
return UserConstants.YES.equals(this.isDefault) ? true : false;
--
Gitblit v1.9.3