sql manager
Merge branch 'master' into working-2
modify deviceDetailviewtroller
修改
Merge branch 'working-2'