Commit Graph

20 Commits

Author SHA1 Message Date
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
shahaibo
62e6f8b77d TASK:数据迁移; 2024-01-26 13:17:59 +08:00
shahaibo
471426e931 TASK:多数据源; 2024-01-19 16:36:34 +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
0313149ea5 修改异常处理+代码清理 2023-11-02 15:35:07 +08:00
shahaibo
44a30bf9b5 TASK: 全局异常优化; 2023-10-31 14:07:43 +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
f18c27fe02 BUGFIX: 代码优化; 2023-10-19 16:12:42 +08:00
shahaibo
81d20625f5 BUGFIX: library upload md5重复校验优化; 2023-10-18 15:54:23 +08:00
shahaibo
2b2fd1a72c BUGFIX: library upload md5重复校验优化; 2023-10-18 14:58:12 +08:00
shahaibo
c3e979e096 BUGFIX: 模特preview; 2023-10-16 11:42:20 +08:00
shahaibo
5e70f7ca73 BUGFIX: 模特preview; 2023-10-16 10:53:37 +08:00
shahaibo
00fcdf9cbf BUGFIX:系统模特上传; 2023-10-04 14:58:06 +08:00
shahaibo
ee32111599 TASK:模特相关接口; 2023-10-04 06:47:48 +08:00
shahaibo
0a3487a3db TASK:机器人、首页、history模块代码; 2023-09-29 21:44:43 +08:00
shahaibo
02d658dd0d TASK:workspace、design模块代码; 2023-09-22 16:28:33 +08:00
LiaoFJ
4c531e3961 first version of aida_back 2023-01-06 15:17:37 +08:00