Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
77bcc5facc
|
@ -79,7 +79,7 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
|
||||||
/**
|
/**
|
||||||
* 个人所得税
|
* 个人所得税
|
||||||
*/
|
*/
|
||||||
@Excel(name = "个税", scale = 2)
|
@Excel(name = "服务费", scale = 2)
|
||||||
@BigDecimalFormat()
|
@BigDecimalFormat()
|
||||||
private BigDecimal incomeTax;
|
private BigDecimal incomeTax;
|
||||||
|
|
||||||
|
@ -93,28 +93,28 @@ public class CuMemberWithdrawVO extends CuMemberBaseVO {
|
||||||
/**
|
/**
|
||||||
* 提现金额
|
* 提现金额
|
||||||
*/
|
*/
|
||||||
@Excel(name = "本次提现($)", scale = 2)
|
// @Excel(name = "本次提现($)", scale = 2)
|
||||||
@BigDecimalFormat()
|
@BigDecimalFormat()
|
||||||
private BigDecimal settleCashAmount;
|
private BigDecimal settleCashAmount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 手续费
|
* 手续费
|
||||||
*/
|
*/
|
||||||
@Excel(name = "手续费($)", scale = 2)
|
// @Excel(name = "手续费($)", scale = 2)
|
||||||
@BigDecimalFormat()
|
@BigDecimalFormat()
|
||||||
private BigDecimal settleServiceCharge;
|
private BigDecimal settleServiceCharge;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 个人所得税
|
* 个人所得税
|
||||||
*/
|
*/
|
||||||
@Excel(name = "个税($)", scale = 2)
|
// @Excel(name = "个税($)", scale = 2)
|
||||||
@BigDecimalFormat()
|
@BigDecimalFormat()
|
||||||
private BigDecimal settleIncomeTax;
|
private BigDecimal settleIncomeTax;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 实发金额
|
* 实发金额
|
||||||
*/
|
*/
|
||||||
@Excel(name = "实发金额($)", scale = 2)
|
// @Excel(name = "实发金额($)", scale = 2)
|
||||||
@BigDecimalFormat()
|
@BigDecimalFormat()
|
||||||
private BigDecimal settleIssuedAmount;
|
private BigDecimal settleIssuedAmount;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue