Browse Source

Merge branch 'develop_yh14' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh15

# Conflicts:
#	package-lock.json
#	public/version.json
lilei 2 năm trước cách đây
mục cha
commit
0fdb3aeebd
3 tập tin đã thay đổi với 10 bổ sung1 xóa
  1. 8 0
      package-lock.json
  2. 1 0
      package.json
  3. 1 1
      public/version.json

+ 8 - 0
package-lock.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",

+ 1 - 0
package.json

@@ -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 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677468926200
+  "version": 1677477194999
 }