修改冲突

修改
2025-09-15 16:35:54 +08:00 · 2025-09-15 16:30:57 +08:00 · 2025-09-09 16:35:54 +08:00
2 changed files with 4 additions and 5 deletions
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
  "name": "ruoyi",
  "version": "3.9.0",
-  "description": "公共服务平台",
-  "author": "bonus",
+  "description": "博诺思公共微服务平台",
+  "author": "博诺思",
  "license": "MIT",
  "scripts": {
    "dev": "vue-cli-service serve",
--- a/vue.config.js
+++ b/vue.config.js
@ -7,9 +7,8 @@ function resolve(dir) {

 const CompressionPlugin = require('compression-webpack-plugin')

-const name = process.env.VUE_APP_TITLE || '公共服务平台' // 网页标题
-
-const baseUrl = 'http://192.168.0.50:58080' // 后端接口
+const name = process.env.VUE_APP_TITLE || '博诺思公共微服务平台' // 网页标题
+const baseUrl = 'http://192.168.0.38:58080' // 后端接口

 const port = process.env.port || process.env.npm_config_port || 80 // 端口
Author	SHA1	Message	Date
haozq	36fa9090ba	修改冲突	2025-09-15 16:35:54 +08:00
haozq	c8a1df4511	修改冲突	2025-09-15 16:30:57 +08:00
haozq	10aa8c5648	修改	2025-09-09 16:35:54 +08:00