Merge branch 'master' into dev

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -837,7 +837,7 @@ public class ProductServiceImpl implements ProductService, Constant {
                     FundNav pre = fundNavs.get(i + 1);
 
                     if (pre.getNav().compareTo(BigDecimal.ZERO) > 0) {
-                        BigDecimal dailyIncrease = f.getNav().subtract(pre.getNav()).divide(pre.getNav(), 4, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal dailyIncrease = f.getCumulativeNavWithdrawal().subtract(pre.getCumulativeNavWithdrawal()).divide(pre.getCumulativeNavWithdrawal(), 4, BigDecimal.ROUND_HALF_UP);
                         vo.setDailyIncrease(BigDecimalUtil.multiply100(dailyIncrease));
                     }
                 }