shahaibo
|
1d71d276bb
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev_shb
|
2024-03-27 13:31:08 +08:00 |
|
shahaibo
|
54fe254ab0
|
BUGFIX;
|
2024-03-27 13:28:48 +08:00 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +08:00 |
|
shahaibo
|
ca70371585
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# 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
|
2024-02-20 10:26:13 +08:00 |
|
shahaibo
|
68f6ae2a8d
|
TASK:design new;
|
2024-02-20 10:12:44 +08:00 |
|
shahaibo
|
4e2e1affa8
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/LibraryService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
# src/main/resources/application-prod.properties
# src/main/resources/application-test.properties
|
2024-02-19 13:02:58 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
shahaibo
|
d4a7fa441c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-01-26 13:18:37 +08:00 |
|
shahaibo
|
62e6f8b77d
|
TASK:数据迁移;
|
2024-01-26 13:17:59 +08:00 |
|
|
|
577dc94850
|
1、generate 异步生成及获取排队情况
2、generate 取消生成
|
2024-01-21 14:14:55 +08:00 |
|
shahaibo
|
471426e931
|
TASK:多数据源;
|
2024-01-19 16:36:34 +08:00 |
|
shahaibo
|
a75cdffe59
|
TASK:design NEW;
|
2024-01-15 15:57:40 +08:00 |
|
shahaibo
|
a3ae8401fb
|
TASK:定时任务执行周期;
|
2024-01-09 13:44:15 +08:00 |
|
shahaibo
|
5bed3c180b
|
TASK:续订通知;
|
2024-01-08 13:02:50 +08:00 |
|
shahaibo
|
ecec69a45e
|
TASK: 枚举类多语言;
|
2023-11-23 10:32:33 +08:00 |
|
shahaibo
|
d71674393f
|
TASK: 语言;
|
2023-10-31 15:28:37 +08:00 |
|
shahaibo
|
bedc640e13
|
TASK: 全局异常处理，代码优化，测试数据库连接信息变更;
|
2023-10-27 10:09:19 +08:00 |
|
shahaibo
|
9fa605f83e
|
BUGFIX: format;
|
2023-10-20 14:47:18 +08:00 |
|
shahaibo
|
a08300f095
|
Merge remote-tracking branch 'origin/develop' into dev_shb
# Conflicts:
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
|
2023-09-13 10:34:09 +08:00 |
|
shahaibo
|
03f8f9a6cf
|
TASK:workspace、design模块代码;
|
2023-09-12 09:51:12 +08:00 |
|
zhouchengrong
|
7dbd9453f8
|
全局跨域
|
2023-07-26 17:23:50 +08:00 |
|
LiaoFJ
|
4c531e3961
|
first version of aida_back
|
2023-01-06 15:17:37 +08:00 |
|
