Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ConfirmReceiptJob.java
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/EvaluateRemindJob.java
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PaymentRemindJob.java
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/PositiveThankJob.java
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/DelayRemindServiceImpl.java
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/TimerTaskServiceImpl.java
# service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application-dev.yml
# trade-pojo/src/main/java/com/hchbox/enums/TradeEnum.java
|