Merge branch 'master' into docker_package

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;
 }

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)

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;
 }

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;
 }

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`;