-
# 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
