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

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java

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