This reverts commit d99047bf.
Conflicts: dal/src/main/resources/META-INF/mybatis/ProductSearchMapper.xml