Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-23 3fd5b6267e4468f179d1f339fee961b89cea7afa

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java

@@ -32,6 +32,9 @@
    @ApiModelProperty(value = "支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty(value = "改变金额")
    private BigDecimal changeMoney;

    @ApiModelProperty(value = "支付方式")
    private Integer payType;