-
# Conflicts: # resource/src/main/java/com/yohoufo/resource/service/impl/resource/ThreePictureResourceParse.java
-
Conflicts: dal/src/main/java/com/yohoufo/dal/order/model/BuyerOrder.java
-
Conflicts: dal/src/main/java/com/yohoufo/dal/order/model/BuyerOrder.java dal/src/main/resources/META-INF/mybatis/order/BuyerOrderMapper.xml order/src/main/java/com/yohoufo/order/service/impl/BuyerBidOrderSubmitService.java order/src/main/java/com/yohoufo/order/service/impl/SubmitOrderServiceImpl.java
