Merge branch 'master' of https://github.com/LynkLin/quot-server.git

Conflicts:
	src/main/java/com/lynk/quot/dao/MachineMapper.java
Merge branch 'master' of https://github.com/LynkLin/quot-server.git