no message
This commit is contained in:
parent
7c71c1f2de
commit
c729cc67e6
@ -1,6 +1,6 @@
|
||||
// 应用全局配置
|
||||
module.exports = {
|
||||
<<<<<<< HEAD
|
||||
|
||||
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
|
||||
// baseUrl: 'http://192.168.0.196:8081/',
|
||||
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
|
||||
@ -8,9 +8,8 @@ module.exports = {
|
||||
// baseUrl: 'http://192.168.31.96:8080/',
|
||||
baseUrl: 'http://192.168.31.178:8081/',
|
||||
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
|
||||
=======
|
||||
baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
|
||||
>>>>>>> 0e220d95754e6cea5279608575dd9f869dbb1219
|
||||
|
||||
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
|
||||
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
|
||||
// 应用信息
|
||||
appInfo: {
|
||||
|
Loading…
Reference in New Issue
Block a user