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

huanghongfa

2021-06-17 ce4b6a8e4c11a869f5707eef053488c62fb97eed

 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;
}