-
Conflicts: dal/src/main/java/com/yoho/ufo/dal/ProductMapper.java dal/src/main/resources/META-INF/mybatis/ProductMapper.xml
-
# Conflicts: # dal/src/main/resources/META-INF/mybatis/UfoSizeMapper.xml
Conflicts: dal/src/main/java/com/yoho/ufo/dal/ProductMapper.java dal/src/main/resources/META-INF/mybatis/ProductMapper.xml
# Conflicts: # dal/src/main/resources/META-INF/mybatis/UfoSizeMapper.xml