Merge remote-tracking branch 'origin/master'

authorize-api-service/src/main/java/com/xy/entity/SysDict.java

@@ -29,10 +29,7 @@ public class SysDict extends BaseEntity2<SysDict> implements Serializable {
 
     @ApiModelProperty("描述")
     private String description;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
+ 
     @ApiModelProperty("是否是系统内置")
     private Boolean systemFlag;
 

authorize-api-service/src/main/java/com/xy/entity/SysDictItem.java

@@ -36,17 +36,15 @@ public class SysDictItem extends BaseEntity2<SysDictItem> implements Serializabl
     @ApiModelProperty("标签")
     private String label;
 
-    @ApiModelProperty("字典类型")
-    private String type;
-
     @ApiModelProperty("描述")
     private String description;
 
     @ApiModelProperty("排序（升序）")
     private Integer sortOrder;
 
-    @ApiModelProperty("备注")
-    private String remark;
+    @ApiModelProperty("是否启用 true启用，false")
+    private Boolean enable;
+
 
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

authorize-api/src/main/java/com/xy/dto/SysDict/SysDictItemDto.java

@@ -35,9 +35,9 @@ public class SysDictItemDto {
 
     @ApiModelProperty("标签")
     private String label;
-
-    @ApiModelProperty("字典类型")
-    private String type;
+    
+    @ApiModelProperty("是否启用 true启用，false")
+    private Boolean enable;
 
     @ApiModelProperty("描述")
     private String description;

authorize-api/src/main/java/com/xy/dto/SysDict/SysDictItemPageDto.java

@@ -34,11 +34,9 @@ public class SysDictItemPageDto {
     @ApiModelProperty("标签")
     private String label;
 
-    @ApiModelProperty("字典类型")
-    private String type;
-
+ 
     @ApiModelProperty("描述")
     private String description;
- 
+
 
 }

authorize-api/src/main/java/com/xy/vo/SysDictItemVo.java

@@ -23,9 +23,7 @@ public class SysDictItemVo {
 
     @ApiModelProperty("ID")
     private Long id;
-
-    @ApiModelProperty("字典ID")
-    private Long dictId;
+ 
 
     @ApiModelProperty("字典标识")
     private String dictKey;
@@ -45,8 +43,8 @@ public class SysDictItemVo {
     @ApiModelProperty("排序（升序）")
     private Integer sortOrder;
 
-    @ApiModelProperty("备注")
-    private String remark;
+    @ApiModelProperty("是否启用 true启用，false")
+    private Boolean enable;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")

authorize-api/src/main/java/com/xy/vo/SysDictVo.java

@@ -1,13 +1,10 @@
 package com.xy.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 字典类型
@@ -21,7 +18,7 @@ import java.time.LocalDateTime;
 @ApiModel("字典类型")
 public class SysDictVo extends BaseVo {
 
- 
+
     @ApiModelProperty("ID")
     private Long id;
 
@@ -31,9 +28,7 @@ public class SysDictVo extends BaseVo {
     @ApiModelProperty("描述")
     private String description;
 
-    @ApiModelProperty("备注")
-    private String remark;
-
+   
     @ApiModelProperty("是否是系统内置")
     private Boolean systemFlag;