Merge remote-tracking branch 'origin/dev'

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

@@ -196,7 +196,7 @@ public class ProductServiceImpl implements ProductService, Constant {
         infos.forEach(info -> {
             ProductInfoVO vo = new ProductInfoVO();
             if (fundCountMap.containsKey(info.getId())) {
-                FundCount fundCount = fundCounts.get(0);
+                FundCount fundCount = fundCountMap.get(info.getId());
                 vo.setRet1m(multiply100(fundCount.getRet1m()));
                 vo.setRetIncep(multiply100(fundCount.getRetIncep()));
             }