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 |
|
|
|
87580cfece
|
接入支付宝 联调修改
|
2024-02-15 14:03:44 +08:00 |
|
|
|
874a59ea04
|
Merge remote-tracking branch 'origin/dev/dev_xp' into dev/dev
|
2024-02-14 12:22:16 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
|
|
9e653595a9
|
generate 添加试用用户判断
|
2024-01-30 11:48:26 +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 |
|
|
|
4c0dd27332
|
generate 记录取消操作
|
2024-01-26 13:12:04 +08:00 |
|
|
|
96858c2cc3
|
TASK:异步调用generate及取消generate
|
2024-01-24 11:43:56 +08:00 |
|
|
|
164454b5b2
|
BUGFIX：数据传输过程中long精度发生丢失
|
2024-01-22 16:21:32 +08:00 |
|
|
|
404172e5f2
|
修改获取结果的请求方式
|
2024-01-22 14:00:05 +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
|
365c04375a
|
TASK:免登录;
|
2024-01-18 09:56:50 +08:00 |
|
shahaibo
|
90634f73c7
|
TASK:免密登录;
|
2024-01-17 17:49:40 +08:00 |
|
shahaibo
|
393c9ec941
|
TASK:证书接收测试;
|
2024-01-17 10:33:37 +08:00 |
|
shahaibo
|
8737350002
|
TASK:免密登录;
|
2024-01-15 16:33:23 +08:00 |
|
shahaibo
|
660ee9d437
|
TASK:免密登录;
|
2024-01-15 15:41:48 +08:00 |
|
shahaibo
|
62f9bb3795
|
TASK:机房免登录测试;
|
2024-01-15 15:06:48 +08:00 |
|
shahaibo
|
71a0a3c06b
|
TASK:到期时间查询;
|
2024-01-04 15:22:38 +08:00 |
|
shahaibo
|
eafa6daf5b
|
TASK:公共标签;
|
2024-01-04 13:57:17 +08:00 |
|
|
|
dd5997fea6
|
统一管理python端服务ip和端口
|
2024-01-02 11:53:09 +08:00 |
|
|
|
d19aa7083b
|
添加状态检测
|
2023-12-29 13:48:42 +08:00 |
|
shahaibo
|
ba6588058a
|
TASK:自动审批;
|
2023-12-14 16:33:57 +08:00 |
|
|
|
26a61a44a2
|
TASK:根据designItemId获取模特图
|
2023-12-14 11:26:12 +08:00 |
|
shahaibo
|
4e3746cfba
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-12-11 16:59:21 +08:00 |
|
shahaibo
|
1f77698bc4
|
TASK: 试用用户添加测试;
|
2023-12-11 16:59:05 +08:00 |
|
|
|
ae91cac28a
|
BUGFIX:添加入参判断
|
2023-12-11 15:32:53 +08:00 |
|
|
|
cd41229f9e
|
TASK:自动识别上传服装的类别
|
2023-12-11 14:24:28 +08:00 |
|
shahaibo
|
2b8f970acc
|
TASK: 试用用户添加测试;
|
2023-12-11 10:52:42 +08:00 |
|
shahaibo
|
91993feee8
|
TASK: 试用用户添加测试;
|
2023-12-11 10:02:05 +08:00 |
|
shahaibo
|
5300cec43d
|
TASK: 试用用户添加测试;
|
2023-12-06 17:02:43 +08:00 |
|
shahaibo
|
9d7cf848e1
|
TASK: 试用用户添加测试;
|
2023-12-06 17:02:25 +08:00 |
|
shahaibo
|
23b69c1e7b
|
TASK: 试用用户添加测试;
|
2023-12-06 16:31:20 +08:00 |
|
shahaibo
|
30ff40e84a
|
TASK: 试用用户添加测试;
|
2023-12-06 15:58:57 +08:00 |
|
shahaibo
|
6d99a5fa16
|
TASK: 是否完成引导字段添加;
|
2023-11-29 14:37:32 +08:00 |
|
shahaibo
|
4b1bf8585d
|
TASK: 裁剪白底字段添加;
|
2023-11-28 15:57:32 +08:00 |
|
shahaibo
|
3e3aaa54c4
|
TASK: sketches裁剪;
|
2023-11-23 15:27:01 +08:00 |
|
shahaibo
|
091c11c951
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-11-20 15:06:29 +08:00 |
|
shahaibo
|
4971f2b96a
|
TASK: 用户试用添加，印花逻辑调整;
|
2023-11-20 15:06:15 +08:00 |
|
xupei
|
ee7820ff8b
|
TASK:moodboard与printboard 图片合成
|
2023-11-16 10:33:08 +08:00 |
|
shahaibo
|
211f589d84
|
TASK: library关联分类;
|
2023-11-14 15:59:11 +08:00 |
|
shahaibo
|
6d673d6f32
|
TASK: library关联分类;
|
2023-11-14 15:26:54 +08:00 |
|
shahaibo
|
8afec1e962
|
TASK: 多语言;
|
2023-11-09 17:13:33 +08:00 |
|
shahaibo
|
f3fcaa3ed6
|
BUGFIX: 男装 outwear single design;
|
2023-11-09 13:19:18 +08:00 |
|
shahaibo
|
269b6fa5fb
|
TASK: library分类;
|
2023-11-07 15:12:55 +08:00 |
|
shahaibo
|
c8fe8c27f8
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/resources/messages_en.properties
|
2023-11-07 11:42:37 +08:00 |
|
shahaibo
|
008d0d626e
|
BUGFIX: 模特删除校验;
TASK: 多语言;
|
2023-11-07 11:32:03 +08:00 |
|
