Commit Graph

134 Commits

Author SHA1 Message Date
f23f4133d0 Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java
2024-05-10 17:25:06 +08:00
shahaibo
b86f168fe8 TASK:design 渐变色; 2024-05-10 17:17:28 +08:00
d41bc284d4 Alipay-HK 接入 暂存 2024-05-10 17:11:49 +08:00
5f0546c6cf design single 在用户submit时将上传的图片保存到library 2024-04-30 10:59:41 +08:00
6d9efc1509 generate 接口参数变更 2024-04-25 12:41:07 +08:00
c44fc14796 BUGFIX: generate 获取结果加判空 2024-04-23 18:32:29 +08:00
a749c5dd2e BUGFIX:便利查询 2024-04-22 13:09:44 +08:00
d2076a81d5 generate 联调修改 2024-04-18 16:48:19 +08:00
8856f7fc7a 漏传 2024-04-18 14:10:52 +08:00
896120fea4 generate模型更换后的接口更改及异步获取结果 2024-04-18 14:07:20 +08:00
754de78b57 single design添加渐变颜色 2024-04-10 11:21:48 +08:00
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
d411b428f8 1、完善超分功能
2、完善积分系统
3、新增任务列表
2024-03-26 14:58:43 +08:00
305324fe1a 1、接入超分功能
2、添加积分系统
3、新增订单查询,积分详细查询
2024-03-15 15:38:56 +08:00
bf05f88c00 Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/DesignMapper.java
#	src/main/resources/mapper/primary/DesignMapper.xml
2024-03-06 21:00:07 +08:00
a016f16052 便利查询--指定用户有权限直接获取当前数据库部分数据 2024-03-04 16:33:23 +08:00
ee96759832 1、接入paypal
2、修改支付宝支付
2024-03-01 17:31:26 +08:00
shahaibo
43ec55dfb6 BUGFIX:Single design; 2024-02-21 13:53:46 +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
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
9e653595a9 generate 添加试用用户判断 2024-01-30 11:48:26 +08:00
shahaibo
f047ca0324 Merge remote-tracking branch 'origin/develop' into develop 2024-01-26 15:33:43 +08:00
shahaibo
f02988a0a7 TASK:分页去除限制; 2024-01-26 15:33:33 +08:00
fc4dcd41ae generate 修改字段名str->content 2024-01-26 14:18:28 +08:00
96858c2cc3 TASK:异步调用generate及取消generate 2024-01-24 11:43:56 +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
90634f73c7 TASK:免密登录; 2024-01-17 17:49:40 +08:00
shahaibo
62f9bb3795 TASK:机房免登录测试; 2024-01-15 15:06:48 +08:00
fe0a736feb designSingle 添加入参日志打印 2024-01-10 15:14:54 +08:00
shahaibo
4a8867dbb5 TASK:批量修改类别; 2024-01-05 11:11:29 +08:00
shahaibo
bd116ff011 BUGFIX:忘记密码; 2023-12-22 14:12:20 +08:00
shahaibo
ce7c6c657b BUGFIX:忘记密码; 2023-12-22 14:05:31 +08:00
shahaibo
5aa2e2a357 TASK:试用订单; 2023-12-14 17:16:23 +08:00
shahaibo
79cff13edb Merge remote-tracking branch 'origin/dev/dev' into develop
# Conflicts:
#	docker-compose.yml
2023-12-13 17:26:48 +08:00
shahaibo
24312a8f2b BUGFIX; 2023-12-13 17:23:06 +08:00
4512fb3268 TASK:getDetail添加返回字段priority 2023-12-13 14:20:13 +08:00
43b9ba74ab 注释添加 2023-12-13 11:25:52 +08:00
51548b52ba TASK:designSingle 添加多件衣服并允许添加相同类型的服装 2023-12-13 10:45:52 +08:00
shahaibo
1f77698bc4 TASK: 试用用户添加测试; 2023-12-11 16:59:05 +08:00
shahaibo
db1aed53eb Merge remote-tracking branch 'origin/develop' into develop 2023-12-11 14:35:21 +08:00
shahaibo
7fdacaeb7c TASK: 试用用户添加测试; 2023-12-11 14:35:05 +08:00
cd41229f9e TASK:自动识别上传服装的类别 2023-12-11 14:24:28 +08:00
shahaibo
91993feee8 TASK: 试用用户添加测试; 2023-12-11 10:02:05 +08:00
shahaibo
be6795b42a BUGFIX: 回显; 2023-12-04 14:04:36 +08:00
shahaibo
6d99a5fa16 TASK: 是否完成引导字段添加; 2023-11-29 14:37:32 +08:00
shahaibo
98ca270156 TASK: 裁剪白底字段添加; 2023-11-29 14:19:04 +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