Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

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

@@ -72,4 +72,10 @@
    @ApiModelProperty(value = "用户收货地址id")
    private ComShopUserAddressVO userAddressVO;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "订单日志")
    private List<ComShopOrderOperateVO> logs;

}