Merge branch 'master' of http://bore.pub:10439/r/MES_Projects

# Conflicts:
#	河北望美项目/MES_11/src/main/java/com/northglass/repository/PatternTaskDao.java
#	河北望美项目/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java
#	河北望美项目/MES_11/src/main/java/com/northglass/service/device/DeviceService.java
#	河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java
#	河北望美项目/MES_11/src/main/resources/application.properties
#	河北望美项目/MES_11/target/classes/application.properties
#	河北望美项目/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
#	河北望美项目/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties
#	河北望美项目/MES_11/target/maven-archiver/pom.properties
#	河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	河北望美项目/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst