上传数据去重复功能
Merge branch 'master' of https://github.com/xiaozhujun/platform

Conflicts:
	business/business-craneInspectReport/src/main/data/craneinspectreport.sql
	business/business-craneInspectReport/src/main/java/org/whut/platform/business/craneinspectreport/mapper/CraneInspectReportMapper.java
	business/business-craneInspectReport/src/main/java/org/whut/platform/business/craneinspectreport/service/CraneInspectReportService.java
	business/business-craneInspectReport/src/main/java/org/whut/platform/business/craneinspectreport/web/CraneInspectReportServiceWeb.java
	business/business-craneInspectReport/src/main/resources/org/whut/platform/business/craneinspectreport/mapper/CraneInspectReportMapper.xml
	business/business-user/src/main/java/org/whut/platform/business/user/entity/Authority.java
	business/business-user/src/main/java/org/whut/platform/business/user/entity/User.java
	business/business-user/src/main/java/org/whut/platform/business/user/mapper/AuthorityMapper.java
	business/business-user/src/main/java/org/whut/platform/business/user/service/AuthorityService.java
	business/business-user/src/main/java/org/whut/platform/business/user/web/AuthorityServiceWeb.java
	business/business-user/src/main/java/org/whut/platform/business/user/web/UserServiceWeb.java
	business/business-user/src/main/resources/org/whut/platform/business/user/mapper/AuthorityMapper.xml
	business/business-user/src/main/resources/org/whut/platform/business/user/mapper/PowerMapper.xml
	business/business-user/src/main/resources/org/whut/platform/business/user/mapper/UserMapper.xml
	riskManagement/src/main/webapp/craneInspectReport/js/jquery.fileUploader.js
	riskManagement/src/main/webapp/js/config.js
	riskManagement/src/main/webapp/menu.html
	riskManagement/src/main/webapp/user/addAuthority.html
	riskManagement/src/main/webapp/user/addUser.html
	riskManagement/src/main/webapp/user/listPower.html