Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
Merge branch 'master' of https://github.com/VNOC/vnoc into Sum_Branch
修改服务端编译不通过问题
Merge pull request #39 from VNOC/Sum_Branch

Sum branch