Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

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

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.shop;

import java.math.BigDecimal;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("订单创建返回参数")
@@ -13,7 +13,13 @@
    @ApiModelProperty(value = "订单号")
    private String orderNo;

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

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

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

}