Commit cff6a689e7158aa2d12d7f02fd49dca36febe25b
1 parent
1f9c1c2f
Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
# Conflicts: # resource/js/unit.js
Showing
1 changed file
with
2 additions
and
3 deletions
resource/js/unit.js
| @@ -10,9 +10,8 @@ sysComm = { | @@ -10,9 +10,8 @@ sysComm = { | ||
| 10 | 10 | ||
| 11 | //阿里云测试环境，别删 | 11 | //阿里云测试环境，别删 |
| 12 | 12 | ||
| 13 | -//var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 | ||
| 14 | - | ||
| 15 | -var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 | 13 | +//var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址 |
| 14 | +var parkcloudbaseUrl = 'http://192.168.1.196:8101/';// url公用地址 | ||
| 16 | 15 | ||
| 17 | 16 | ||
| 18 | 17 |