-
# Conflicts: # promotion/src/main/java/com/yohoufo/promotion/controller/OrderCouponController.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/model/request/ShoppingRequest.java
-
# Conflicts: # web/src/main/resources/config.properties # web/src/main/webapp/META-INF/autoconf/config.properties