Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

This commit is contained in:
zhn
2022-09-07 18:57:23 +08:00
@@ -3209,8 +3209,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
}
} else if ("TEXT".equals(type)) {
//lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n");
lastOne.setValContent(itemsValEO.getItemContent() + "\n");
lastOne.setValContent(StringUtils.isNotEmpty(lastOne.getValContent())? lastOne.getValContent() : "" + itemsValEO.getItemContent() + "\n");
valContent.add(lastOne);
//第一次