Commit Graph

976 Commits

Author SHA1 Message Date
xupei
6dc61dd452 模特相关修改
及图层修改 添加优先级
2023-10-04 14:51:00 +08:00
shahaibo
9e7ed913ce TASK:印花; 2023-10-04 13:16:02 +08:00
shahaibo
db502aaef5 Merge remote-tracking branch 'origin/develop' into develop 2023-10-04 09:26:48 +08:00
shahaibo
114b78bdfa TASK:印花; 2023-10-04 09:26:26 +08:00
xupei
0103b0c814 修改图层大小和位置 2023-10-04 08:59:27 +08:00
shahaibo
fd5e47ecdc TASK:印花; 2023-10-04 08:20:59 +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
b9abb2dd8f TASK:参数名修改; 2023-10-03 18:40:23 +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
1959e3b7ff TASK:roll back; 2023-09-29 21:45:22 +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
xupei
255529c8bc getDetail 修改bug-相同的colorIndex导致颜色返回为空 2023-09-22 17:04:08 +08:00
shahaibo
02d658dd0d TASK:workspace、design模块代码; 2023-09-22 16:28:33 +08:00
xupei
55e32d2fe7 getDetail 不返回颜色问题修改 2023-09-22 16:07:11 +08:00
xupei
b2e3347a92 design single submit bug修改 2023-09-22 13:41:55 +08:00
xupei
11fdeebe76 bug修改 2023-09-21 14:34:50 +08:00
xupei
dcd4ce584c 印花坐标修改 2023-09-21 13:44:39 +08:00
xupei
e1b3c20131 Merge remote-tracking branch 'origin/dev_shb' into develop 2023-09-21 11:36:43 +08:00
shahaibo
1870996244 TASK:workspace、design模块代码; 2023-09-21 11:35:58 +08:00
xupei
ba96d52611 模特路径修改 2023-09-21 09:59:36 +08:00
xupei
e0d8d14235 模特路径修改 2023-09-21 09:55:21 +08:00
xupei
20f5a3eda2 design single接口疏通 2023-09-20 16:16:02 +08:00
xupei
7e6047ddf7 Merge remote-tracking branch 'origin/dev_shb' into develop
# Conflicts:
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
2023-09-20 16:04:12 +08:00
shahaibo
49b62d3733 TASK:workspace、design模块代码; 2023-09-20 16:02:57 +08:00
shahaibo
d3530f0af9 Merge remote-tracking branch 'origin/dev-xp' into dev_shb
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
2023-09-20 13:35:35 +08:00
xupei
3f90715e00 Merge remote-tracking branch 'origin/dev_shb' into develop 2023-09-20 13:12:00 +08:00
shahaibo
0115759563 TASK:workspace、design模块代码; 2023-09-20 13:03:07 +08:00
xupei
8478de460a Merge remote-tracking branch 'origin/dev_shb' into develop
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
2023-09-20 13:02:02 +08:00
shahaibo
cbb5145123 TASK:workspace、design模块代码; 2023-09-20 12:05:08 +08:00
xupei
7269c19aab generate 接口疏通 2023-09-19 16:37:23 +08:00
xupei
3afe1c715d generate 接口疏通 2023-09-19 15:52:33 +08:00
xupei
aef2bb7457 generate 修改dislike接口 2023-09-19 15:39:21 +08:00
xupei
eb2ef0f39d generate 添加dislike功能
获取library地址修改(兼容minio地址)
2023-09-19 15:21:53 +08:00
xupei
00803692b2 minio 返回路径修改 2023-09-19 13:25:55 +08:00
xupei
a543dde9a7 generate bug修改 2023-09-19 10:56:17 +08:00
xupei
d418df3c60 generate 接口疏通 2023-09-19 10:25:03 +08:00
xupei
88b526f1c4 getDetail designSingle bug修改 2023-09-18 17:22:15 +08:00
xupei
206f365ff3 design Single接口第二版 2023-09-18 14:44:30 +08:00
xupei
778bb9534d design Single接口第一版 2023-09-18 11:33:13 +08:00
xupei
305b932cbd design Single接口第一版 2023-09-18 11:31:26 +08:00
xupei
146101eec4 Merge remote-tracking branch 'origin/dev_shb' into dev-xp 2023-09-18 10:09:53 +08:00
shahaibo
9ba7049438 TASK:workspace、design模块代码; 2023-09-18 09:51:53 +08:00
xupei
01cdbf99f9 Merge remote-tracking branch 'origin/dev_shb' into dev-xp
# Conflicts:
#	src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java
2023-09-14 14:19:34 +08:00
shahaibo
e007d2353e TASK:workspace、design模块代码; 2023-09-14 13:19:54 +08:00
xupei
cf771a5b77 修改 design single功能 2023-09-14 12:58:49 +08:00