jacsonJSON改为fastjson
Merge branch 'master' of https://github.com/bcw104/scada-oildata-webapp

Conflicts:
	src/main/java/com/ht/scada/oildata/Scheduler.java
	src/main/webapp/WEB-INF/views/account/adminUserForm.jsp
	src/main/webapp/WEB-INF/views/account/adminUserList.jsp
	src/main/webapp/WEB-INF/views/account/profile.jsp
	src/main/webapp/WEB-INF/views/sysmgr/roleMenu.jsp