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

jiangqs

2023-07-07 0ab1b864458f36b294933112824b10b13770915e

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

@@ -22,6 +22,6 @@
    @ApiModelProperty(value = "实收金额")
    private BigDecimal relReceiveMoney;

    @ApiModelProperty(value = "实收金额")
    @ApiModelProperty(value = "实付金额")
    private BigDecimal relPayMoney;
}