Merge branch 'dev' of 47.100.44.39:zhoupeng/tamp_fund into dev

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

@@ -200,7 +200,7 @@ public class ProductServiceImpl implements ProductService, Constant {
             BeanUtils.copyProperties(info, vo);
             vo.setProductName(info.getFundShortName());
             vo.setDesc(info.getDescInfo());
-
+            vo.setFundId(info.getId());
             // 最新净值
             vo.setNet(getNewNet(info.getId()));
             vos.add(vo);
@@ -1414,6 +1414,7 @@ public class ProductServiceImpl implements ProductService, Constant {
                 }
 
                 ProductInfoVO p = new ProductInfoVO();
+                p.setFundId(item.getId());
                 p.setProductName(item.getFundName());
                 p.setRet1m(importedFundCount == null ? null : BigDecimalUtil.toString(importedFundCount.getRet1m(), 2));
                 p.setNet(importedFundCount == null ? null : Net.builder().netDate(importedFundCount.getPriceDate().getTime())