合并代码冲突

This commit is contained in:
yanyizhou
2021-08-27 15:30:23 +08:00
committed by zhaokaiyao@91isoft.com
parent c22db5b063
commit 3070ec5e59
@@ -2174,7 +2174,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
String txt = extractor.getText(); String txt = extractor.getText();
content.append(txt); content.append(txt);
} }
} else { } else {
PDDocument document = PDDocument.load(new File(readFilePath)); PDDocument document = PDDocument.load(new File(readFilePath));
document.getClass(); document.getClass();
if (!document.isEncrypted()) { if (!document.isEncrypted()) {