研究报告海外支付

common/src/main/java/com/jeesite/common/constant/Constants.java

@@ -228,5 +228,6 @@ public interface Constants {
         String LOCK_ORDER_PAY_PREFIX = "lockOrderPay";
     }
 
-    String textFormat = "<p>%s</p>";
+    String textFormat = "<p><span style=\"font-size: 16px; font-family: 微软雅黑;\">%s</span></p>";
+    String textLineFormat = "</span></p><p><span style=\"font-size: 16px; font-family: 微软雅黑;\">";
 }

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

@@ -966,7 +966,7 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 					ResearchReport update = new ResearchReport();
 					update.setReportCode(dto.getReportCode());
 					update.setReportRegion(dto.getReportRegion());
-					update.setMarketScale(String.format(Constants.textFormat, dto.getMarketScale()).replaceAll("\\n\\n", "</p><p>"));
+					update.setMarketScale(String.format(Constants.textFormat, dto.getMarketScale()).replaceAll("\\n\\n", Constants.textLineFormat));
 					updateList.add(update);
 				}
 			}
@@ -1033,7 +1033,7 @@ public class ResearchReportService extends CrudService<ResearchReportDao, Resear
 					ResearchReport update = new ResearchReport();
 					update.setReportCode(dto.getReportCode());
 					update.setReportRegion(dto.getReportRegion());
-					update.setMarketDriven(String.format(Constants.textFormat, dto.getMarketDriven()).replaceAll("\\n\\n", "</p><p>"));
+					update.setMarketDriven(String.format(Constants.textFormat, dto.getMarketDriven()).replaceAll("\\n\\n", Constants.textLineFormat));
 					updateList.add(update);
 				}
 			}