-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
-
add cal buyer cancel penalty
-
fix bug
-
# Conflicts: # common/src/main/java/com/yohoufo/common/utils/DateUtil.java
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
add cal buyer cancel penalty
fix bug
# Conflicts: # common/src/main/java/com/yohoufo/common/utils/DateUtil.java