Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/neic

vue.config.js

@@ -4,7 +4,16 @@ module.exports = {
     },
     pluginOptions:{
       electronBuilder:{
-        nodeIntegration:true
+        nodeIntegration:true,
+        builderOptions: {
+          appId: 'com.neic.gyee',
+          win: {
+            icon: 'src/assets/img/logo.ico'
+          },
+          linux: {
+            
+          }
+        }
       }
     }
   }