-
# Conflicts: # dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java # order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
-
Conflicts: dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java
# Conflicts: # dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java # order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
Conflicts: dal/src/main/java/com/yoho/order/model/BuyerOrderReq.java