Merge main into shccd159,保留 shccd159 配置(jjy/ccd 域名)

Made-with: Cursor
This commit is contained in:
apple
2026-03-18 10:35:08 +08:00
35 changed files with 355 additions and 81 deletions

View File

@@ -5,11 +5,8 @@ ENV = 'production'
# VUE_APP_BASE_API = '/prod-api'
# VUE_APP_BASE_API = 'http://127.0.0.1:8080'
# VUE_APP_BASE_API = 'https://jf.suzhouyuqi.com'
# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com'
# VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com'
# VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com'
# VUE_APP_BASE_API = 'http://jfadmin-bsy.bosenyuan.com'
# miao33 项目
<<<<<<<< HEAD:backend-adminend/.env.production
# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com'
# shjjy153 项目
@@ -17,3 +14,9 @@ ENV = 'production'
# shccd159 项目
VUE_APP_BASE_API = 'http://ccd-jfadmin.fwxgpt.com'
========
VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com'
# VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com'
# VUE_APP_BASE_API = 'http://jfadmin-bsy.bosenyuan.com'
>>>>>>>> origin/main:frontend/.env.production