Merge remote-tracking branch 'origin/v1.2.0' into dev

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

@@ -1516,6 +1516,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()));