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

This commit is contained in:
sangelxiu1 2025-06-27 11:47:39 +08:00
commit 8f459c779e
1 changed files with 6 additions and 5 deletions

View File

@ -26,11 +26,6 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
// private BigDecimal expandIncome; // private BigDecimal expandIncome;
// //
// /** // /**
// * 辅导收益
// */
// private BigDecimal coachIncome;
//
// /**
// * 分红收益 // * 分红收益
// */ // */
// private BigDecimal shareIncome; // private BigDecimal shareIncome;
@ -107,6 +102,12 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
@BigDecimalFormat @BigDecimalFormat
private BigDecimal retailMonthRepurchaseIncome; private BigDecimal retailMonthRepurchaseIncome;
/**
* 培育津贴
*/
@BigDecimalFormat
private BigDecimal coachIncome;
/** /**
* 福利分红收益总计 * 福利分红收益总计
*/ */