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

CeDo

2021-05-13 a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706

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

@@ -57,4 +57,19 @@
    @ApiModelProperty(value = "商品规格")
    private String goodsAttr;

    /**
     * 商品状态(1.出售中  2.已下架 3.已删除)
     */
    @ApiModelProperty(value = "商品状态(1.出售中  2.已下架 3.已删除)")
    private Integer goodsStatus = 1;

    /**
     * 商品状态(1.出售中  2.已下架 3.已删除)
     */
    public interface goodsStatus{
        int csz = 1;
        int yxj = 2;
        int ysc = 3;
    }

}