-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/pay/weixin/AbstractWeixinPayService.java
-
This reverts commit d6791b66.
-
(cherry picked from commit 7a620426)
-
# Conflicts: # product/src/main/java/com/yohoufo/product/controller/ProductController.java # product/src/main/java/com/yohoufo/product/service/impl/StoragePriceService.java
-
# Conflicts: # product/src/main/java/com/yohoufo/product/service/impl/StoragePriceService.java
-
# Conflicts: # promotion/src/main/java/com/yohoufo/promotion/service/impl/CouponServiceImpl.java
