Merge branch 'dev' into HuiFu

# Conflicts: # jsowell-admin/src/test/java/SpringBootTestController.java # jsowell-pile/pom.xml
2026-04-20 02:55:04 +08:00 · 2023-05-11 15:00:36 +08:00
parent 0bb109f523 e50be067ae
commit 2ef229e50c
39 changed files with 1657 additions and 134 deletions
--- a/jsowell-pile/pom.xml
+++ b/jsowell-pile/pom.xml
@@ -87,6 +87,11 @@
            <groupId>com.huifu.adapay</groupId>
            <artifactId>adapay-java-sdk</artifactId>
        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
    </dependencies>

    <properties>