Merge branch 'hemenkou_dev' into dev

101captain

2022-03-09 9c5b811fb700bc66e66dbf38ed8733e57a4edac6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopEditNubCartDTO.java

@@ -13,9 +13,9 @@
@ApiModel("购物车修改")
public class ComShopEditNubCartDTO {

    @ApiModelProperty(value = "购物车id",required = true)
    @ApiModelProperty(value = "购物车id", required = true)
    private Long cartId;

    @ApiModelProperty(value = "购物车商品数量",required = true)
    @ApiModelProperty(value = "购物车商品数量", required = true)
    private Integer number;
}