Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
Data#40_xiquan:filetransfer revised
Merge pull request #41 from shuanzi/Data#40_xiquan

Data#40_xiquan->wangfeng
OK
Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
Data#40_yuanzhe:add param uri in update value methods
Data#40_yuanzhe:add field in db,is_delete
Data#40_yuanzhe:modify doc for db design
Data#40_yuanzhe:modify sql
Merge pull request #42 from huyuanzhe/Data#40_yuanzhe

Data#40 yuanzhe -> wangfeng
OK
data#40_wangfeng:Add monitorNetlink
Merge pull request #43 from v11985/data#40_wangfeng

data#40_wangfeng:Add monitorNetlink->yuanzhe
Data#40_xiquan:改进逻辑
Merge pull request #44 from shuanzi/Data#40_xiquan

Data#40_xiquan->wangfeng
OK
Fix some bugs
temp
Merge branch 'data#40_wangfeng' of github.com:v11985/demo-rio into data#40_wangfeng
merge
Data#40_yuanzhe:fix bug with uri
Merge pull request #46 from huyuanzhe/Data#40_yuanzhe

Data#40_yuanzhe -> wangfeng
OK