Merge branch 'LD' of ssh://was.baoshi56.com:10022/var/git/bswas into LD

.gitignore

@@ -7,6 +7,8 @@
 /public/images/QRCodeIMG/*
 /resources/images/QRCodeIMG/*
 /public/mix-manifest.json
+/public/js/app.js
+/public/css/app.csscd
 /storage/*.key
 /vendor
 .env

public/js/app.js

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
   false;
 
 /**
@@ -86489,4 +86489,4 @@ module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss *
 
 /***/ })
 
-/******/ });
+/******/ });