Conflicts: src/main/java/com/mmc/pms/dao/IndustrySpecDao.java src/main/resources/mapper/ProductDao.xml
This reverts commit 7dbdfc3d.
This reverts commit 97194407.