# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
…nto hotfix_0605_erpStatusStr