# Conflicts: # package-lock.json # public/version.json
@@ -13693,6 +13693,14 @@
"sha.js": "^2.4.8"
}
},
+<<<<<<< HEAD
+=======
+ "pdfjs-dist": {
+ "version": "2.5.207",
+ "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz",
+ "integrity": "sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw=="
+ },
+>>>>>>> a073e588945e7fb0dbbf7f12204ce7579203e684
"pdfjs-dist-sign": {
"version": "2.5.208",
"resolved": "https://registry.npmjs.org/pdfjs-dist-sign/-/pdfjs-dist-sign-2.5.208.tgz",
@@ -26,6 +26,7 @@
"mockjs2": "1.0.7",
"moment": "^2.29.1",
"nprogress": "^0.2.0",
+ "pdfjs-dist": "^2.5.207",
"screenfull": "^5.1.0",
"v-runtime-template": "^1.10.0",
"v-viewer": "^1.6.4",
@@ -1,5 +1,5 @@
{
"message": "发现有新版本发布,确定更新系统?",
"vendorJsVersion": "",
- "version": 1677468926200
+ "version": 1677477194999