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

huanghongfa

2021-05-14 8a7fbad84879f277e10f857004c31d57aeecbd5a

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

@@ -13,6 +13,9 @@
    @ApiModelProperty(value = "订单号")
    private String orderNo;

    @ApiModelProperty(value = "订单ID")
    private Long orderId;

    @ApiModelProperty(value = "订单金额")
    private BigDecimal orderTotal;