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

无关风月

6 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 cloud-server-account/src/main/java/com/dsh/account/model/WorldCupPayment.java

@@ -67,6 +67,11 @@
     */
    private String refundOrderNo;
    /**
     * 退款金额
     */
    @TableField("refundAmount")
    private BigDecimal refundAmount;
    /**
     * 状态（1=正常，2=冻结，3=删除）
     */
    private Integer state;