|
|
94927ae0a4
|
modify
|
2024-08-05 15:48:50 +08:00 |
|
|
|
4d7153661c
|
Merge branch 'release/3.0' into dev/dev
|
2024-08-05 15:39:01 +08:00 |
|
|
|
76062136d6
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-08-05 15:38:05 +08:00 |
|
|
|
ea4ba74989
|
管理员系统功能添加
|
2024-08-05 15:19:02 +08:00 |
|
shahaibo
|
5a09d7a195
|
BUGFIX:过滤已废弃
|
2024-08-02 12:28:58 +08:00 |
|
shahaibo
|
e0332b9ddf
|
BUGFIX:过滤已废弃
|
2024-08-02 12:21:30 +08:00 |
|
shahaibo
|
685ba09f7d
|
BUGFIX:过滤已废弃
|
2024-08-02 12:13:32 +08:00 |
|
shahaibo
|
fada00c738
|
BUGFIX:过滤已废弃
|
2024-08-02 11:36:58 +08:00 |
|
|
|
a10d30337a
|
支付切换为live
|
2024-08-01 10:30:44 +08:00 |
|
|
|
85ffed114b
|
语言适配
|
2024-08-01 10:07:24 +08:00 |
|
|
|
1093ac68b6
|
查询指定用户各功能使用情况
|
2024-08-01 10:00:26 +08:00 |
|
|
|
018ccef46a
|
to prod
|
2024-07-29 17:47:09 +08:00 |
|
|
|
0106f21b86
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-07-29 17:31:21 +08:00 |
|
|
|
1b5f64785d
|
调查问卷查看
|
2024-07-29 17:24:14 +08:00 |
|
shahaibo
|
832f331603
|
TASK:配置文件dev分支改为dev
|
2024-07-22 11:14:19 +08:00 |
|
徐佩
|
34c4cd47ef
|
Merge remote-tracking branch 'origin/release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/task/AccountTask.java
|
2024-07-21 09:54:42 +08:00 |
|
|
|
c46f65600f
|
添加 开展活动接口
|
2024-07-19 15:40:54 +08:00 |
|
|
|
4626ea3c55
|
prod stripe->live
|
2024-07-17 16:21:05 +08:00 |
|
|
|
5858f7dcf1
|
添加stripe接口路由到过滤器
|
2024-07-17 16:05:33 +08:00 |
|
|
|
36e41ecd89
|
push to prod 配置修改
|
2024-07-17 15:28:55 +08:00 |
|
|
|
e1b08a9979
|
modify:Stripe
|
2024-07-17 15:26:11 +08:00 |
|
|
|
925da9fa03
|
prod->local 合代码配置修改
|
2024-07-10 14:28:50 +08:00 |
|
|
|
505288fdb7
|
代码合并修改
|
2024-07-10 11:01:25 +08:00 |
|
|
|
429fdad2b7
|
Merge branch 'test/stable' into release/3.0
|
2024-07-10 10:56:07 +08:00 |
|
|
|
46fbbd747e
|
alipay-hk 配置文件位置修改
|
2024-07-10 10:47:36 +08:00 |
|
|
|
803bdfd291
|
alipay-hk 配置文件路径修改
|
2024-07-10 10:08:20 +08:00 |
|
shahaibo
|
a56510c35a
|
TASK:变回develop环境
|
2024-07-09 23:44:40 +08:00 |
|
shahaibo
|
5297880c3b
|
BUGFIX:aida;
|
2024-07-09 17:10:49 +08:00 |
|
shahaibo
|
0c6187a759
|
BUGFIX:aida;
|
2024-07-09 10:13:32 +08:00 |
|
shahaibo
|
0b8d0a1843
|
BUGFIX:aida;
|
2024-07-09 09:46:41 +08:00 |
|
shahaibo
|
42f1d47f82
|
BUGFIX:aida;
|
2024-07-08 16:17:13 +08:00 |
|
shahaibo
|
bc240cd2ee
|
TASK:aida;
|
2024-06-27 17:36:47 +08:00 |
|
shahaibo
|
f869f8eb10
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-27 15:33:38 +08:00 |
|
shahaibo
|
9b438c78a3
|
TASK:aida;
|
2024-06-27 15:33:26 +08:00 |
|
|
|
e614e3a07a
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/GenerateService.java
|
2024-06-25 16:59:41 +08:00 |
|
shahaibo
|
8c65592394
|
TASK:aida;
|
2024-06-25 16:43:54 +08:00 |
|
|
|
be001477ce
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-06-25 15:42:22 +08:00 |
|
shahaibo
|
9b589eece6
|
TASK:aida;
|
2024-06-25 10:59:58 +08:00 |
|
|
|
57ab6c64ef
|
flask 迁移到fast-api 9992 -> 9994
|
2024-06-24 14:33:34 +08:00 |
|
|
|
227c742f0d
|
新增接口：调查问卷
|
2024-06-20 10:27:04 +08:00 |
|
|
|
4f12aa92b6
|
slogan 参数校验
|
2024-06-18 13:13:20 +08:00 |
|
|
|
e6a2ce2b69
|
dev 配置文件修改
|
2024-06-18 10:19:56 +08:00 |
|
shahaibo
|
676ef74bdc
|
TASK:aida;
|
2024-06-17 19:25:37 +08:00 |
|
shahaibo
|
02787db0a1
|
TASK:aida;
|
2024-06-17 17:37:15 +08:00 |
|
shahaibo
|
375f717721
|
TASK:aida;
|
2024-06-17 09:43:59 +08:00 |
|
shahaibo
|
18914bea7e
|
TASK:aida;
|
2024-06-17 09:34:48 +08:00 |
|
|
|
619d33b412
|
Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/resources/application-dev.properties
# src/main/resources/messages_en.properties
# src/main/resources/messages_zh.properties
|
2024-06-12 10:50:05 +08:00 |
|
|
|
1a48527c70
|
1、design single 添加 design elements
2、design single -- print添加level2Type
3、替换部分flask接口 为 fastAPI接口
|
2024-06-12 10:41:59 +08:00 |
|
shahaibo
|
ee68a5d782
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-06-12 09:48:11 +08:00 |
|
shahaibo
|
3a29d25060
|
TASK:aida;
|
2024-06-12 09:47:55 +08:00 |
|
