You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

bynt 5f7ba1d39b 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		3 years ago
..
src/main/java/com/hchbox	Merge remote-tracking branch 'origin/dev' into dev	3 years ago
.gitignore	[其他提交](master): init project(Temporary storage)	3 years ago
pom.xml	修改全局变量 增加全局异常变量	3 years ago