Commit Graph

599 Commits

Author SHA1 Message Date
shahaibo
2832105ac2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 13:57:32 +08:00
shahaibo
eafa6daf5b TASK:公共标签; 2024-01-04 13:57:17 +08:00
7a309bcb17 机器人返回图片数量修改 2024-01-04 11:47:09 +08:00
shahaibo
fc4a59d41a Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 11:04:45 +08:00
shahaibo
11f94ebcb4 BUGFIX:element上传; 2024-01-04 11:04:15 +08:00
7c94bc4826 机器人返回图片路径修改 2024-01-04 10:15:48 +08:00
zchengrong
00cf7b3140 Update DesignServiceImpl.java 2024-01-02 17:13:13 +08:00
zchengrong
914910903e Update application-test.properties 2024-01-02 17:05:37 +08:00
28d92c468c Merge remote-tracking branch 'origin/develop' into dev/dev
# Conflicts:
#	src/main/resources/application-prod.properties
2024-01-02 13:05:06 +08:00
dd5997fea6 统一管理python端服务ip和端口 2024-01-02 11:53:09 +08:00
d19aa7083b 添加状态检测 2023-12-29 13:48:42 +08:00
zhouchengrong
858a195e13 新增aws 状态检测接口 2023-12-29 13:35:39 +08:00
4b1974aceb 添加状态检测 2023-12-29 13:19:48 +08:00
eb45f6e7d0 history designSingle之后日期未更新-bug修复 2023-12-28 17:58:51 +08:00
1c8f230a64 Merge remote-tracking branch 'origin/dev/dev' into dev/dev 2023-12-28 16:35:31 +08:00
shahaibo
85b4d674ea Merge remote-tracking branch 'origin/dev/dev' into dev/dev 2023-12-28 13:56:18 +08:00
shahaibo
8c3b658df0 Merge remote-tracking branch 'origin/develop' into dev/dev 2023-12-28 13:52:28 +08:00
46511fed71 Merge remote-tracking branch 'origin/develop' into dev/dev 2023-12-28 11:05:07 +08:00
f346727469 Merge remote-tracking branch 'origin/develop' into develop 2023-12-28 09:46:03 +08:00
e9844e38a4 generate 为version 1添加str前缀及判空 2023-12-28 09:45:44 +08:00
shahaibo
91012a00b6 BUGFIX:element上传; 2023-12-27 11:08:09 +08:00
shahaibo
bd116ff011 BUGFIX:忘记密码; 2023-12-22 14:12:20 +08:00
shahaibo
ce7c6c657b BUGFIX:忘记密码; 2023-12-22 14:05:31 +08:00
131f46b59e 配置文件修改 2023-12-22 12:09:00 +08:00
shahaibo
0f8f6679ab Merge remote-tracking branch 'origin/develop' into develop 2023-12-22 11:17:51 +08:00
shahaibo
a5d08e700a BUGFIX:retrieve; 2023-12-22 11:17:35 +08:00
f98f54f3c1 Merge remote-tracking branch 'origin/develop' into dev/dev
# Conflicts:
#	docker-compose.yml
2023-12-22 10:55:34 +08:00
zchengrong
23e2c507df Update docker-compose.yml 2023-12-22 10:45:24 +08:00
zchengrong
6331b5d164 Update docker-compose.yml 2023-12-22 10:44:58 +08:00
zchengrong
2dd1ad8a08 Update docker-compose.yml 2023-12-22 10:35:58 +08:00
e45e63103f BUGFIX:修复获取图片命名 2023-12-21 14:23:33 +08:00
shahaibo
640c9527be Merge remote-tracking branch 'origin/develop' into develop 2023-12-21 10:55:34 +08:00
shahaibo
8fa682e9e8 TASK:minio地址更新; 2023-12-21 10:55:14 +08:00
480eb72be0 BUGFIX:修复single模式下衣服图层不返回 2023-12-20 11:18:38 +08:00
shahaibo
8dd658f1e9 BUGFIX: 使用订单通过后的邮件标题,多语言内容更新; 2023-12-18 17:18:19 +08:00
a9c5a5fd2b BUGFIX:修复衣服删除为0件时导致的数据库查询报错 2023-12-15 10:49:57 +08:00
shahaibo
5aa2e2a357 TASK:试用订单; 2023-12-14 17:16:23 +08:00
shahaibo
ba6588058a TASK:自动审批; 2023-12-14 16:33:57 +08:00
shahaibo
8b3058513f Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 16:21:42 +08:00
shahaibo
f9b24492c9 BUGFIX:choose; 2023-12-14 16:21:21 +08:00
2de3a73fef BUGFIX:衣服图层添加优先级后对之前数据不兼容的修复-漏提交 2023-12-14 15:49:29 +08:00
86ab0806fd BUGFIX:衣服图层添加优先级后对之前数据不兼容的修复 2023-12-14 15:47:03 +08:00
fef71ead79 TASK:category识别python端端口变更 2023-12-14 14:05:02 +08:00
26a61a44a2 TASK:根据designItemId获取模特图 2023-12-14 11:26:12 +08:00
shahaibo
4d87164b8e BUGFIX:choose; 2023-12-14 10:57:47 +08:00
shahaibo
81d178b3a4 BUGFIX:library男模特打点预览; 2023-12-14 10:46:03 +08:00
zchengrong
51f3b5b30b Update docker-compose.yml 2023-12-14 10:35:16 +08:00
zchengrong
b4b935c378 Update docker-compose.yml 2023-12-14 10:33:30 +08:00
shahaibo
b0dc1f4763 BUGFIX:library男模特打点预览; 2023-12-14 10:21:30 +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