talk
/
talk_appAmin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

main
Connor 2024-06-12 22:24:14 +08:00
parent c355fffc92
commit 47912d45e1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.js
View File

@ -4,13 +4,9 @@ export default {
uploadQiNiuDomain: 'https://upload-z2.qiniup.com', uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
// baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://47.93.242.168:8080', // baseUrl: 'http://47.93.242.168:8080',
<<<<<<< HEAD
// baseUrl: 'http://47.93.242.168:8080', // baseUrl: 'http://47.93.242.168:8080',
baseUrl: 'http://localhost:8080', baseUrl: 'http://localhost:8080',
=======
// baseUrl: 'http://47.93.242.168:8080',
baseUrl: 'http://localhost:8080',
>>>>>>> 628ee1926942d01758e141fb0b5393a175968240
// 应用信息 // 应用信息
appInfo: { appInfo: {
// 应用名称 // 应用名称