锁定，停用按钮 功能完善
Merge branch 'xyn-branch'