Merge branch 'test_visit' into 'test'

罗元桥

2021-06-24 14e9e46c441de408616f5ce500623ac1d3d93b5c

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

@@ -70,6 +70,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date deliveryTime;

    @ApiModelProperty(value = "收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date receivingTime;

    @ApiModelProperty(value = "订单下商品信息")
    private List<ComShopOrderGoodsVO> orderGoodsVOList;