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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -16,24 +16,24 @@
    /**
     * 商品id
     */
    @ApiModelProperty(value = "商品名称",required = true)
    @ApiModelProperty(value = "商品名称", required = true)
    private Long goodsId;

    /**
     * 商品规格id
     */
    @ApiModelProperty(value = "商品规格id",required = true)
    @ApiModelProperty(value = "商品规格id", required = true)
    private Long goodsAttrId;

    /**
     * 数量
     */
    @ApiModelProperty(value = "数量",required = true)
    @ApiModelProperty(value = "数量", required = true)
    private Integer number;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}