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

huanghongfa

2021-08-13 c9d1bf762e05e8a83cda1da6c56f4bd96d3b67fc

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

@@ -30,4 +30,7 @@

    @ApiModelProperty("配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;

    @ApiModelProperty(hidden = true)
    private Long userId;
}