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

jiangping

2024-10-17 14b70bacd63f6b136612cf70b160777142e2a996

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

@@ -38,7 +38,7 @@
    private Integer categoryId;

    @ApiModelProperty(value = "所属品类编码(base_category)")
    private Integer categoryName;
    private String categoryName;

    @ApiModelProperty(value = "所属品牌编码(base_brand)")
    private Integer brandId;