Merge remote-tracking branch 'origin/master'

doum

2026-02-13 8dfc59832df6e86f1840857a5b497faa9061a2af

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java

@@ -40,6 +40,8 @@
    @ApiModelProperty(value = "排序方式：0=综合排序；1=销量由低到高 ；2=价格由低到高；3=销量由高到低；4=价格由高到低")
    private Integer sortInfo;

    @ApiModelProperty(value = "经销商主键")
    private Integer shopId;

    @ApiModelProperty(value = "一级分类编码")
    private Integer parentCategoryId;