Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 33a80f6b0585a320872477f85a50aa10ca1d20b1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java

@@ -70,10 +70,15 @@
    private BigDecimal originalPrice;

    /**
     * 商品现价
     * 包邮价
     */
    @ApiModelProperty("商品现价")
    private BigDecimal price;
    @ApiModelProperty("包邮价")
    private BigDecimal freeShippingPrice;
    /**
     * 拼单价
     */
    @ApiModelProperty("拼单价")
    private BigDecimal collatePrice;

    /**
     * 商品单位
@@ -130,7 +135,15 @@
    /**
     * 浏览量
     */
    @ApiModelProperty("浏览量")
    private Integer viewNum;


    /**
     * 评价数量
     */
    @ApiModelProperty("评价数量")
    private Integer evaluateNum;

    /**
     * 商品规格列表
@@ -142,3 +155,5 @@
    @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
    private List<Long> categoryIds;
}