xupei
|
dac556a4ba
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-10-05 14:25:41 +08:00 |
|
xupei
|
9877a5240f
|
BUGFIX:印花 overall
|
2023-10-05 14:25:25 +08:00 |
|
shahaibo
|
907184d2eb
|
BUGFIX:模特;
|
2023-10-05 13:37:42 +08:00 |
|
shahaibo
|
9d1d555032
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-10-05 12:11:25 +08:00 |
|
shahaibo
|
54bbf0b9b3
|
BUGFIX:模特;
|
2023-10-05 12:05:16 +08:00 |
|
xupei
|
7a1652ac60
|
BUGFIX:编辑图层位置大小
|
2023-10-05 11:30:06 +08:00 |
|
xupei
|
a9f24e8fe5
|
BUGFIX:添加progress_id
|
2023-10-05 09:43:03 +08:00 |
|
xupei
|
abecb54b1d
|
BUGFIX:获取模特信息
|
2023-10-04 19:14:42 +08:00 |
|
shahaibo
|
a5a70884b8
|
BUGFIX:系统模特上传;
|
2023-10-04 17:34:52 +08:00 |
|
shahaibo
|
f661271f48
|
BUGFIX:系统模特上传;
|
2023-10-04 17:28:24 +08:00 |
|
shahaibo
|
c1c1687e8e
|
BUGFIX:系统模特上传;
|
2023-10-04 17:22:42 +08:00 |
|
shahaibo
|
1ef079a1f9
|
BUGFIX:系统模特上传;
|
2023-10-04 17:02:54 +08:00 |
|
shahaibo
|
9bf7bba29c
|
BUGFIX:系统模特上传;
|
2023-10-04 16:27:15 +08:00 |
|
shahaibo
|
7daa3dc004
|
BUGFIX:系统模特上传;
|
2023-10-04 16:22:46 +08:00 |
|
shahaibo
|
4068a64c54
|
BUGFIX:系统模特上传;
|
2023-10-04 16:20:36 +08:00 |
|
shahaibo
|
b560deb1f3
|
BUGFIX:系统模特上传;
|
2023-10-04 16:14:52 +08:00 |
|
shahaibo
|
edc4947280
|
BUGFIX:系统模特上传;
|
2023-10-04 16:11:27 +08:00 |
|
shahaibo
|
b46a1815e5
|
BUGFIX:系统模特上传;
|
2023-10-04 16:09:11 +08:00 |
|
shahaibo
|
9c3ab437fb
|
BUGFIX:系统模特上传;
|
2023-10-04 15:56:31 +08:00 |
|
shahaibo
|
3620a0a895
|
BUGFIX:系统模特上传;
|
2023-10-04 15:37:20 +08:00 |
|
shahaibo
|
0893af46dd
|
BUGFIX:系统模特上传;
|
2023-10-04 15:29:54 +08:00 |
|
shahaibo
|
2ad61ff618
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-10-04 15:06:34 +08:00 |
|
shahaibo
|
00fcdf9cbf
|
BUGFIX:系统模特上传;
|
2023-10-04 14:58:06 +08:00 |
|
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
|
d6e74883b9
|
配置文件修改
|
2023-09-20 16:52:46 +08:00 |
|