 lixioayao
|
123ab80a13
增加分站进出逻辑
|
6 years ago |
 liheting
|
c33ba71c8d
Merge branch 'master' of chensongchao/ya-serv into master
|
6 years ago |
 daiyueteng
|
ec73fadf93
把加载历史区域放到最后 on_enter
|
6 years ago |
 chensongchao
|
dc3f4a373f
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
3401d77762
ptr bug fix
|
6 years ago |
|
chensongchao
|
9cfa18a322
功能测试，告警测试-修改BUG
|
6 years ago |
|
chensongchao
|
36da22718d
合并主干代码，解决冲突
|
6 years ago |
|
chensongchao
|
d180c7bc47
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
daiyueteng
|
f3b13c3aee
数据赋值
|
6 years ago |
|
daiyueteng
|
914e78805f
增加推业务
|
6 years ago |
|
chensongchao
|
85139ee40a
功能测试，告警测试-修改BUG
|
6 years ago |
|
daiyueteng
|
2052b76019
修改 event_ptr 空指针bug
|
6 years ago |
|
daiyueteng
|
7a51e5a357
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
daiyueteng
|
a0ce8ebf66
修改车卡考勤
|
6 years ago |
|
lixioayao
|
86f1827c0a
on_enter Ptr .you can assign it directly
|
6 years ago |
|
lixioayao
|
e7f967b077
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
lixioayao
|
b3344efd35
增加反向告警和追尾告警，修复了vim造成得tab问题
|
6 years ago |
|
daiyueteng
|
2e1ea14a81
初始化进出区域时间
|
6 years ago |
|
daiyueteng
|
5b26c0f9c7
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
daiyueteng
|
00e125bb8e
修改人卡，ptr转移赋值
|
6 years ago |
|
lixioayao
|
633bca05b9
修改考勤地标的获取方式
|
6 years ago |
|
lixioayao
|
967bde2172
merge
|
6 years ago |
|
lixioayao
|
b14ee56502
增加了前端推送多个区域信息包括地标信息的功能，修改了之前的地标信息的逻辑
|
6 years ago |
|
chensongchao
|
3684eac2ea
同步主干代码，修改冲突的代码
|
6 years ago |
 zzj
|
65438a86a1
编译文件调整
|
6 years ago |
|
zzj
|
b9c72d2182
Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv
|
6 years ago |
|
zzj
|
6492f30c2c
Makefile.am 添加area_business相关文件
|
6 years ago |
|
liheting
|
d71b2587a4
Merge branch 'master' of liulei/ya-serv into master
|
6 years ago |
|
lixioayao
|
da736b9eb7
fix db encode
|
6 years ago |
 liulei
|
8ce10ec8e5
解决冲突
|
6 years ago |
