diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java index 93f43a1ec..a098cb25c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysProductCategory.java @@ -38,6 +38,10 @@ public class SysProductCategory extends XktBaseEntity { * 显示顺序 */ private Integer orderNum; + /** + * 图标url + */ + private String iconUrl; /** * 状态(0正常 1停用) */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/AppHomeProdCateListResVO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/AppHomeProdCateListResVO.java index 8ad2d0984..5c2aff406 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/AppHomeProdCateListResVO.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/AppHomeProdCateListResVO.java @@ -19,9 +19,11 @@ public class AppHomeProdCateListResVO { @ApiModelProperty(value = "商品分类主键") @JsonProperty(value = "prodCateId") private Long id; - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private String name; - @ApiModelProperty(name = "显示顺序") + @ApiModelProperty(value = "显示顺序") private Integer orderNum; + @ApiModelProperty(value = "图标url") + private String iconUrl; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/ProdCateListResVO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/ProdCateListResVO.java index 89a5d14b6..0b3d6cd7a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/ProdCateListResVO.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/vo/productCategory/ProdCateListResVO.java @@ -31,6 +31,8 @@ public class ProdCateListResVO { private Integer orderNum; @ApiModelProperty(value = "状态") private String status; + @ApiModelProperty(value = "图标url") + private String iconUrl; @ApiModelProperty(value = "备注") private String remark; @ApiModelProperty(value = "创建时间") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataDTO.java index 9be90b62c..5785c27b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataDTO.java @@ -27,9 +27,9 @@ public class DictDataDTO { private String dictValue; @ApiModelProperty(value = "字典类型") private String dictType; - @ApiModelProperty(name = "状态") + @ApiModelProperty(value = "状态") private String status; - @ApiModelProperty(name = "备注") + @ApiModelProperty(value = "备注") private String remark; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataResDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataResDTO.java index 371568875..6b5ec3367 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataResDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/dictData/DictDataResDTO.java @@ -28,7 +28,7 @@ public class DictDataResDTO { private String dictValue; @ApiModelProperty(value = "字典类型") private String dictType; - @ApiModelProperty(name = "状态") + @ApiModelProperty(value = "状态") private String status; @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/AppHomeProdCateListResDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/AppHomeProdCateListResDTO.java index 7b1cc9431..e3ba73cd6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/AppHomeProdCateListResDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/AppHomeProdCateListResDTO.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.experimental.Accessors; /** * @author liujiang @@ -14,13 +15,16 @@ import lombok.Data; @ApiModel("APP首页商品分类") @Data @JsonInclude(JsonInclude.Include.NON_NULL) +@Accessors(chain = true) public class AppHomeProdCateListResDTO { @ApiModelProperty(value = "商品分类主键") private Long id; - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private String name; - @ApiModelProperty(name = "显示顺序") + @ApiModelProperty(value = "显示顺序") private Integer orderNum; + @ApiModelProperty(value = "图标url") + private String iconUrl; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateDTO.java index e5599f520..6789a7cfa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateDTO.java @@ -17,15 +17,17 @@ public class ProdCateDTO { @ApiModelProperty(value = "商品分类主键, 新增不传 编辑必传") private Long prodCateId; - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private String name; - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private Long parentId; - @ApiModelProperty(name = "显示顺序") + @ApiModelProperty(value = "显示顺序") private Integer orderNum; - @ApiModelProperty(name = "状态") + @ApiModelProperty(value = "状态") private String status; - @ApiModelProperty(name = "备注") + @ApiModelProperty(value = "图标url") + private String iconUrl; + @ApiModelProperty(value = "备注") private String remark; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListDTO.java index b8e5b31bf..95d16b27d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListDTO.java @@ -15,9 +15,9 @@ import lombok.Data; @JsonInclude(JsonInclude.Include.NON_NULL) public class ProdCateListDTO { - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private String name; - @ApiModelProperty(name = "状态") + @ApiModelProperty(value = "状态") private String status; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListResDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListResDTO.java index 9f23bd944..3a558d1de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListResDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productCategory/ProdCateListResDTO.java @@ -23,20 +23,22 @@ public class ProdCateListResDTO { @ApiModelProperty(value = "商品分类主键") @JsonProperty(value = "prodCateId") private Long id; - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private String name; - @ApiModelProperty(name = "分类名称") + @ApiModelProperty(value = "分类名称") private Long parentId; - @ApiModelProperty(name = "显示顺序") + @ApiModelProperty(value = "显示顺序") private Integer orderNum; - @ApiModelProperty(name = "状态") + @ApiModelProperty(value = "状态") private String status; - @ApiModelProperty(name = "备注") + @ApiModelProperty(value = "图标url") + private String iconUrl; + @ApiModelProperty(value = "备注") private String remark; - @ApiModelProperty(name = "创建时间") + @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; - @ApiModelProperty(name = "子分类") + @ApiModelProperty(value = "子分类") private List children; }