-
# Conflicts: # dal/src/main/java/com/yoho/order/dal/AppraiseOrderMetaMapper.java # dal/src/main/java/com/yoho/order/model/AppraiseOrderMeta.java # dal/src/main/java/com/yoho/order/model/AppraiseOrderResp.java # dal/src/main/resources/META-INF/mybatis/AppraiseOrderMetaMapper.xml # order/src/main/java/com/yoho/ufo/order/service/impl/AppraiseOrderServiceImpl.java # web/src/main/resources/databases.yml # web/src/main/webapp/META-INF/autoconf/databases.yml
-
# Conflicts: # dal/src/main/java/com/yoho/order/dal/AppraiseOrderGoodsMapper.java # dal/src/main/java/com/yoho/order/dal/AppraiseOrderMapper.java # dal/src/main/java/com/yoho/order/model/AppraiseOrder.java # dal/src/main/java/com/yoho/order/model/AppraiseOrderGoods.java # dal/src/main/resources/META-INF/mybatis/AppraiseOrderGoodsMapper.xml # dal/src/main/resources/META-INF/mybatis/AppraiseOrderMapper.xml
