潘钊 / bsth_control · Commits

Commit dcbadccee9bf31b9b3c1348766b1e3d3af09e788

Authored by youxiw2000
1 parent f6d54f73
build: skipped

1

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @dcbadcc
... ... @@ -987,9 +987,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ
987 987 // 返回值String
988 988 String stationRStr = "";
989 989 // windows下的文本文件换行符
990   - String enterStr = "\r\n";
  990 +// String enterStr = "\r\n";
991 991 // linux/unix下的文本文件换行符
992   -// String enterStr = "\r";
  992 + String enterStr = "\r";
993 993 int defaultZdxh = 0;
994 994 if(objects.size()>0) {
995 995 for(int i = 0; i<objects.size();i++) {
... ... @@ -1212,9 +1212,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
1212 1212 public String hxTextFileToFtp(List<Object[]> objects,Integer lineId) {
1213 1213 String restStr = "";
1214 1214 // windows下的文本文件换行符
1215   - String enterStr = "\r\n";
  1215 +// String enterStr = "\r\n";
1216 1216 // linux/unix下的文本文件换行符
1217   -// String enterStr = "\r";
  1217 + String enterStr = "\r";
1218 1218 int xh = 1 ;
1219 1219 for(int x =0;x<2;x++) {
1220 1220 for(int i = 0; i<objects.size();i++) {
... ...