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

无关风月

8 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Withdraw.java

@@ -13,6 +13,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * <p>
@@ -63,6 +64,9 @@
    @ApiModelProperty("城市code")
    @TableField("city_code")
    private String cityCode;
    @ApiModelProperty("提现进度")
    @TableField(exist = false)
    private List<WithdrawRecord> withdrawRecords;


}