Data#40_xiquan:delete trash lines
Data#40_xiquan:merge conflict
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan
Merge branch 'Data#40_xiquan' of github.com:shuanzi/demo-rio into Data#40_xiquan
Data#40_xiquan:update数据据同步新框架;建立数据的linklist;待合并测试。
Data#40_xiquan:完善update整体框架;完善versionCtrl基本流程;新的update表单
Data#40_xiquan:fix bugs
Merge branch 'Data#40_xiquan' of github.com:shuanzi/demo-rio into Data#40_xiquan
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan
Data#40_xiquan:fix bugs
Merge branch 'Data#40_xiquan' of github.com:shuanzi/demo-rio into Data#40_xiquan
Data#40_xiquan:upadte部分：修改版本控制策略，处理最终版本为对方之前版本的情况，待完善
Data#40_xiquan:fix bug
Merge branch 'Data#40_xiquan' of github.com:shuanzi/demo-rio into Data#40_xiquan
Data#40_xiquan:fix bug
Merge branch 'Data#40_xiquan' of github.com:shuanzi/demo-rio into Data#40_xiquan
Data#40_xiquan:mark error
Data#40_xiquan:fix bugs
Data#40_xiquan:fix
Data#40_xiquan:fix