Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

.env.development

@@ -3,9 +3,8 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-
-VUE_APP_BASE_API = 'http://192.168.1.22:9104'
-# VUE_APP_BASE_API = 'http://127.0.0.1:9104'
+# VUE_APP_BASE_API = 'http://192.168.1.22:9104'
+VUE_APP_BASE_API = 'http://192.168.1.26:9104'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
@@ -15,4 +14,3 @@ VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 # Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-