微信移动端支付

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchReportService.java

@@ -962,7 +962,7 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 						where.setReportRegion(dto.getReportRegion());
 						ResearchReport researchReport = dao.getByEntity(where);
 						if (researchReport != null) {
-							researchReport.setMarketScale(String.format(Constants.textFormat, dto.getMarketScale()));
+							researchReport.setMarketScale(String.format(Constants.textFormat, dto.getMarketScale()).replaceAll("\\n", "<br/>"));
 							saveCount += dao.update(researchReport);
 						} else {
 							msg.append("第"+(i+1)+"行，研究报告对应为空！");
@@ -1018,7 +1018,7 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 						where.setReportRegion(dto.getReportRegion());
 						ResearchReport researchReport = dao.getByEntity(where);
 						if (researchReport != null) {
-							researchReport.setMarketDriven(String.format(Constants.textFormat, dto.getMarketDriven()));
+							researchReport.setMarketDriven(String.format(Constants.textFormat, dto.getMarketDriven()).replaceAll("\\n", "<br/>"));
 							saveCount += dao.update(researchReport);
 						} else {
 							msg.append("第"+(i+1)+"行，研究报告对应为空！");