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/ComShopOrderVO.java

@@ -16,4 +16,7 @@
    @ApiModelProperty(value = "订单金额")
    private BigDecimal orderTotal;

    @ApiModelProperty(value = "请求支付返回参数")
    private String payResult;

}