# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
#	src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java
#	src/main/java/com/gogirl/interfaces/xcx/PayController.java

微信重复支付根据金额做下单唯一处理。

# Conflicts:
#	src/main/resources/mapper/order/OrderCommentMapper.xml