-
# Conflicts: # dal/src/main/java/com/yoho/product/dal/SecondhandInfoMapper.java # dal/src/main/java/com/yoho/product/model/SecondhandInfo.java # dal/src/main/resources/META-INF/mybatis/SecondhandInfoMapper.xml # web/src/main/resources/databases.yml # web/src/main/webapp/META-INF/autoconf/databases.yml
-
Conflicts: pom.xml
