Files
payment-spring-boot/payment-spring-boot-autoconfigure/src
dax 37dba72e7b Merge branch 'release' into payscore
# Conflicts:
#	docs/stackoverflow.md
#	payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java
#	payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PromotionDetail.java
#	payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineTransactionConsumeData.java
2020-12-18 18:52:43 +08:00
..