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

DESKTOP-71BH0QO\L、ming

2021-05-10 b7ee93df9c0f10ce17431fd1ef33506742977b82

 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;