json实现改为fastjson
Merge branch 'master' of https://github.com/bcw104/scada-security

Conflicts:
	src/main/java/com/ht/scada/security/entity/MenuItem.java