Merge branch 'master' of github.com:dromara/dax-pay into gateway

Browse Source

# Conflicts:
#	README.md
#	_config/sql/2.0.2/2.0.2.update.data.sql
#	_doc/ChangeLog.md
#	_doc/Task.md
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/configuration/sequence/DaxPaySequenceConfiguration.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayReconcileService.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WechatPayReconcileService.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/task/notice/entity/ClientNoticeTask.java
#	pom.xml

...

This commit is contained in:

xxm1995

2024-03-15 09:11:55 +08:00

parent 41d67a9feb 6a1e3f8d6b

commit 7cead5ab4e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available