-
# Conflicts: # order/src/main/java/com/yohoufo/order/model/response/OfflinePaymentResponse.java
-
Conflicts: product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
# Conflicts: # order/src/main/java/com/yohoufo/order/model/response/OfflinePaymentResponse.java
Conflicts: product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java