-
…nto hotfix_0605_erpStatusStr
-
This reverts commit cce52a64.
-
# Conflicts: # order/src/main/java/com/yohoufo/order/controller/ShoppingController.java # order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java # web/src/main/resources/config.properties
-
This reverts commit eb98d8aa.
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java