modified lock view
lock view
solve lock.phtml conflict
Merge branch 'beijing' of https://github.com/healerkx/NuclideDataCenter into beijing
add chart in cinderallaDevice
Merge pull request #12 from oisy/beijing

Beijing