Merge branch 'v1.2.0' of 47.100.44.39:zhoupeng/tamp_fund into v1.2.0

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

@@ -252,6 +252,8 @@ public class ProductServiceImpl implements ProductService, Constant {
             vo.setFundId(info.getId());
             // 最新净值
             vo.setNet(getNewNet(info.getId()));
+            vo.setStrategy(info.getStrategy() + "");
+            vo.setSubstrategy(info.getSubstrategy() + "");
             vo.setProductType(Constant.ONE_NUM);
             vos.add(vo);
         });
@@ -1516,6 +1518,8 @@ public class ProductServiceImpl implements ProductService, Constant {
                 ProductInfoVO p = new ProductInfoVO();
                 p.setOpenDay(item.getOpenDay());
                 p.setFundId(item.getId());
+                p.setSubstrategy(item.getSubstrategy() + "");
+                p.setStrategy(item.getStrategy() + "");
                 p.setProductName(item.getFundName());
                 p.setRet1m(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRet1m()));
                 p.setRetIncep(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRetIncep()));