aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
#	src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
#	src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
#	src/main/java/com/ai/da/mapper/primary/entity/Product.java
#	src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
This commit is contained in:
shahaibo
2024-02-20 10:26:13 +08:00
parent 68f6ae2a8d 35fbd4d865
commit ca70371585
43 changed files with 1730 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -177,6 +177,13 @@
<artifactId>commons-pool2</artifactId>
</dependency>
<!--支付宝 SDK-->
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
<version>4.22.57.ALL</version>
</dependency>
</dependencies>
<build>