Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java

@@ -3,7 +3,6 @@ package com.ruoyi.platform.controller.aim;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
 import com.ruoyi.platform.service.AimService;
-import com.ruoyi.platform.service.TensorBoardService;
 import com.ruoyi.platform.vo.FrameLogPathVo;
 import com.ruoyi.platform.vo.PodStatusVo;
 import io.swagger.annotations.Api;

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java

@@ -227,8 +227,8 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
             for(ModelsVersion modelsVersion : modelsVersions) {
                 insertPrepare(modelsVersion);
             }
-            insertModelsDependency(modelsVersions.get(0));
             this.modelsVersionDao.insertBatch(modelsVersions);
+            insertModelsDependency(modelsVersions.get(0));
             return "新增模型版本成功";
         } catch (Exception e) {
             // 如果出现异常，返回异常消息