Merge remote-tracking branch 'origin/master'

This commit is contained in:
@QQNZX 2023-12-05 11:41:51 +08:00
commit ec5443d79c

View File

@ -2,7 +2,11 @@
module.exports = {
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
// baseUrl: 'http://192.168.0.196:8081/',
<<<<<<< HEAD
baseUrl: 'http://192.168.1.6:8008/',
=======
baseUrl: 'http://192.168.0.196:8080/',
>>>>>>> 6a67ef9347914e251c82bfcd14c04a8964fd161f
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
imagesUrl: 'http://www.nuoyunr.com/lananRsc',