Data#40_xiquan:fix
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan
Data#40_xiquan:fix bugs
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan
Data#40_xiquan:fix bug
Data#40)xiquan:fix bug
Data#40_xiquan:fix bug done in insert & delete
Merge pull request #116 from v11985/data#40_wangfeng

Data#40 wangfeng ->xiquan
Data#40_xiquan:完成情况#1的update功能，待测试;情况#2&3待完成
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan
merge #116
fix bug
fix bug
fix bug
fix bug
fix bug
Data#40_xiquan:condition #1 done;fixed bug for #1;
Merge pull request #118 from shuanzi/Data#40_xiquan

Data#40_Xiquan->wangfeng
OK
addFolderModeView_wangyu: add folder mode view method
addFolderModeView-wangyu: add folder mode view