Merge branch 'dev' into build

# Conflicts:
#	package.json
#	vue.config.js

examples/store/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import preState from 'vuex-persistedstate'
 import * as modules from "dvcp-ui/lib/js/modules"
+import axios from "../router/axios";
 
 Vue.use(Vuex)
 
@@ -15,6 +16,11 @@ export default new Vuex.Store({
     },
     cleanApps(state) {
       state.apps = []
+    },
+    setFinanceUser(state) {
+      axios.post("appfinancialorganizationuser/checkUser").then(res => {
+        state.user.financeUser = res.data
+      }).catch(() => 0)
     }
   },
   modules,