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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

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

@@ -51,4 +51,10 @@
    @ApiModelProperty(value = "商品规格id")
    private Long goodsAttrId;

    /**
     * 商品规格
     */
    @ApiModelProperty(value = "商品规格")
    private String goodsAttr;

}