Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -384,7 +384,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 					if(projectNameList.contains("非项目发票")){
 						continue;
 					}
-					projectNameList.add("其它："+projectRelation.getDetails());
+					projectNameList.add("其它："+projectRelation.getDetails().replaceAll("\\r|\\n*",""));
 
 				}