---解决冲突
This commit is contained in:
parent
674e9062e1
commit
69089dd9af
@ -9,11 +9,7 @@
|
|||||||
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
|
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
|
||||||
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
|
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
|
||||||
// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境
|
// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境
|
||||||
<<<<<<< HEAD
|
|
||||||
// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
|
// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
|
||||||
=======
|
|
||||||
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
|
|
||||||
>>>>>>> 订单售后v2
|
|
||||||
export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
|
export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
|
||||||
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
|
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user