Conflicts: product/src/main/java/com/yohoufo/product/service/impl/StoragePriceService.java
This reverts commit d6791b66.
(cherry picked from commit 7a620426)
