Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-14 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11

 server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java

@@ -30,10 +30,10 @@
    @ApiModelProperty(value = "属性2名称")
    private String attrSecond;

    @ApiModelProperty(value = "状态 0启用 1禁用", example = "1")
    @ApiModelProperty(value = "状态 0启用 1禁用")
    private Integer status;

    @ApiModelProperty(value = "排序码", example = "1")
    @ApiModelProperty(value = "排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "图标")