Merge branch 'test' into 'test_bak'

罗元桥

2021-10-01 d0ae6a6e9a8123f4869417b46e5d7423f8ca66d6

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

@@ -17,6 +17,8 @@

    @ApiModelProperty(value = "店铺名称")
    private String storeName;
    @ApiModelProperty(value = "店铺Id")
    private Long storeId;

    @ApiModelProperty(value = "商品状态(1.出售中  2.已下架  3.回收站)", example = "1")
    private Integer status;