Conflicts:
	src/main/java/com/mmc/pms/dao/IndustrySpecDao.java
	src/main/resources/mapper/ProductDao.xml