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
|
f02988a0a7
|
TASK:分页去除限制;
|
2024-01-26 15:33:33 +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
|
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 |
|
|
|
51548b52ba
|
TASK:designSingle 添加多件衣服并允许添加相同类型的服装
|
2023-12-13 10:45:52 +08:00 |
|
|
|
cd41229f9e
|
TASK:自动识别上传服装的类别
|
2023-12-11 14:24:28 +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
|
f0aa041c1e
|
TASK: 枚举类多语言;
|
2023-11-23 14:05:04 +08:00 |
|
shahaibo
|
9e3c29bd47
|
TASK: sketchBoard上传；工作空间列表;
|
2023-11-22 15:18:58 +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
|
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 |
|
shahaibo
|
bb1c56182e
|
BUGFIX: sketchBoard upload checkMd5校验;
TASK: 分类;
|
2023-11-03 14:59:19 +08:00 |
|
xupei
|
ffcbabf62e
|
Generate
1、将生成图片的md5存储到数据库
2、记录sketchboard下，生成图片时的性别（添加到generateType之后）
|
2023-11-03 11:29:54 +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
|
81d20625f5
|
BUGFIX: library upload md5重复校验优化;
|
2023-10-18 15:54:23 +08:00 |
|
shahaibo
|
89d3349b49
|
BUGFIX: retrive回参参数名统一;
|
2023-10-17 13:42:41 +08:00 |
|
shahaibo
|
9e2f4f75c1
|
TASK:导出喜欢 图片名称添加;
|
2023-10-11 13:39:24 +08:00 |
|
shahaibo
|
9c162f7ab8
|
TASK:retrive返回添加图片名称;
|
2023-10-11 11:03:31 +08:00 |
|
xupei
|
2d8672e0a8
|
接口修改：存储offset并返回给前端
|
2023-10-11 10:37:11 +08:00 |
|
shahaibo
|
e6a72b6a32
|
TASK:男装;
|
2023-10-10 15:02:06 +08:00 |
|
shahaibo
|
84c45cb550
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-10-10 14:19:29 +08:00 |
|
shahaibo
|
4a803d90f2
|
TASK:代码提交;
|
2023-10-10 14:19:10 +08:00 |
|
xupei
|
7d8c3ca8f3
|
接口修改: designSingle添加返回参数 offset,currentFullBodyView
|
2023-10-09 16:40:39 +08:00 |
|
shahaibo
|
26f4566fac
|
BUGFIX:系统模特高宽默认1050 500;
|
2023-10-09 10:26:10 +08:00 |
|
xupei
|
d8d167baa8
|
designSingle 新增返回图层minio地址
|
2023-10-05 15:09:49 +08:00 |
|
shahaibo
|
907184d2eb
|
BUGFIX:模特;
|
2023-10-05 13:37:42 +08:00 |
|
shahaibo
|
4068a64c54
|
BUGFIX:系统模特上传;
|
2023-10-04 16:20:36 +08:00 |
|
xupei
|
6dc61dd452
|
模特相关修改
及图层修改 添加优先级
|
2023-10-04 14:51:00 +08:00 |
|
shahaibo
|
ee32111599
|
TASK:模特相关接口;
|
2023-10-04 06:47:48 +08:00 |
|
shahaibo
|
612fb61ac1
|
TASK:参数名修改;
|
2023-10-03 18:40:55 +08:00 |
|
shahaibo
|
0931923d0b
|
Merge remote-tracking branch 'origin/develop' into dev_shb
# Conflicts:
# src/main/java/com/ai/da/mapper/entity/SysFile.java
|
2023-09-30 13:23:08 +08:00 |
|
shahaibo
|
0a3487a3db
|
TASK:机器人、首页、history模块代码;
|
2023-09-29 21:44:43 +08:00 |
|
xupei
|
b0095e26a7
|
design detail 新增接口--编辑图层的位置、大小
|
2023-09-29 13:59:38 +08:00 |
|
xupei
|
f026a9b929
|
Merge remote-tracking branch 'origin/dev_shb' into develop
# Conflicts:
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
|
2023-09-28 10:29:54 +08:00 |
|
xupei
|
7356a0a3c4
|
designSingle 、getDetail 接口联调修改
|
2023-09-26 16:28:36 +08:00 |
|
xupei
|
8a3c42ac0e
|
designSingle 、getDetail 添加返回印花详细
|
2023-09-26 15:47:01 +08:00 |
|
shahaibo
|
02d658dd0d
|
TASK:workspace、design模块代码;
|
2023-09-22 16:28:33 +08:00 |
|
xupei
|
b2e3347a92
|
design single submit bug修改
|
2023-09-22 13:41:55 +08:00 |
|
xupei
|
dcd4ce584c
|
印花坐标修改
|
2023-09-21 13:44:39 +08:00 |
|
