modify
Merge branch 'lxyao' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into napu
modify gps socketserver
Merge branch 'master' into napu
modify gps
Merge branch 'lxyao' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
Merge branch 'master' into napu
Merge branch 'sky' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
modify shortdist.php
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
Merge branch 'master' into napu
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
add alarm time
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms
Merge branch 'master' into napu
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into napu
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into napu
evaluate_document,plan_document