Merge branch 'dev' into HuiFu

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/test/java/SpringBootTestController.java
This commit is contained in:
2023-05-17 16:43:07 +08:00
8 changed files with 124 additions and 204 deletions

View File

@@ -92,6 +92,16 @@
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>com.huifu.adapay.core</groupId>
<artifactId>adapay-core-sdk</artifactId>
</dependency>
<dependency>
<groupId>com.huifu.adapay</groupId>
<artifactId>adapay-java-sdk</artifactId>
</dependency>
</dependencies>
<properties>