From cf7dc6b2de60e259bc8bcbbfd60485963ec2cfaa Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Sat, 29 Oct 2022 14:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=86=85=E5=AE=B9=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/renren/modules/sys/dto/SysDictDataDTO.java  | 4 ++++
 .../main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java  | 3 +++
 .../java/io/renren/modules/sys/entity/SysDictDataEntity.java | 5 +++++
 .../java/io/renren/modules/sys/entity/SysDictTypeEntity.java | 5 +++++
 .../src/main/resources/db/V7.1__sys_dict_data_col.sql        | 4 ++++
 5 files changed, 21 insertions(+)
 create mode 100644 renren-admin/src/main/resources/db/V7.1__sys_dict_data_col.sql

diff --git a/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java b/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java
index d3d8303d..23b5d42f 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictDataDTO.java
@@ -53,4 +53,8 @@ public class SysDictDataDTO implements Serializable {
     @ApiModelProperty(value = "更新时间")
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private Date updateDate;
+
+    @ApiModelProperty(value = "启用状态")
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Integer status;
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java b/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java
index 06cfbdba..ef4de77e 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/dto/SysDictTypeDTO.java
@@ -52,6 +52,9 @@ public class SysDictTypeDTO implements Serializable {
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private Date updateDate;
 
+    @ApiModelProperty(value = "启用状态")
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private Integer status;
 
     @ApiModelProperty(value = "对应字典数据")
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
diff --git a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java
index b010abaa..a087e060 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictDataEntity.java
@@ -47,4 +47,9 @@ public class SysDictDataEntity extends BaseEntity {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateDate;
+
+    /**
+     * 启用状态
+     */
+    private Integer status;
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java
index 3ea12338..b9b2c087 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/entity/SysDictTypeEntity.java
@@ -43,4 +43,9 @@ public class SysDictTypeEntity extends BaseEntity {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateDate;
+
+    /**
+     * 启用状态
+     */
+    private Integer status;
 }
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/db/V7.1__sys_dict_data_col.sql b/renren-admin/src/main/resources/db/V7.1__sys_dict_data_col.sql
new file mode 100644
index 00000000..b8e5f326
--- /dev/null
+++ b/renren-admin/src/main/resources/db/V7.1__sys_dict_data_col.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `sys_dict_data`
+MODIFY COLUMN `status` int NULL DEFAULT 1 COMMENT '启用状态(0未启用  1启用)' AFTER `update_date`;
+ALTER TABLE `sys_dict_type`
+MODIFY COLUMN `status` int NULL DEFAULT 1 COMMENT '启用状态(0未启用  1启用)' AFTER `update_date`;
\ No newline at end of file