Merge branch 'main' of http://8.130.49.250:3000/admin/gr_bi_web

# Conflicts:
#	src/views/login.vue

config/dev.env.js

@@ -4,6 +4,6 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://127.0.0.1:48090"'
+  // BASE_API: '"http://127.0.0.1:48090"'
-  // BASE_API: '"http://192.168.1.241:8080/prod-api"'
+  BASE_API: '"http://192.168.1.241:8080/prod-api"'
 })

src/views/login.vue

@@ -160,7 +160,8 @@ export default {
        this.logincasapi();
      } else {
 
-     }
+         
+      }
   },
   created() {},
   methods: {