|
|
3662ed3f96
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-03-26 15:02:12 +08:00 |
|
|
|
d411b428f8
|
1、完善超分功能
2、完善积分系统
3、新增任务列表
|
2024-03-26 14:58:43 +08:00 |
|
|
|
e84d800ba0
|
加入积分系统，将充值与积分关联
|
2024-03-06 20:56:22 +08:00 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +08:00 |
|
shahaibo
|
6e191413b9
|
TASK:数据库地址修改:;
|
2024-02-22 13:38:07 +08:00 |
|
shahaibo
|
002a47c169
|
TASK:dev分支端口;
|
2024-02-20 11:05:01 +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 |
|
|
|
318d0a1441
|
充值功能--接入支付宝
|
2024-02-14 12:37:57 +08:00 |
|
shahaibo
|
2b2fb4319a
|
TASK:配置文件;
|
2024-01-29 11:10:00 +08:00 |
|
徐佩
|
90edb573d9
|
design detail代码转移，临时存储
|
2023-09-06 13:53:15 +08:00 |
|
