aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/main/resources/messages_en.properties
This commit is contained in:
shahaibo
2023-11-07 11:42:37 +08:00
parent 008d0d626e 331490c447
commit c8fe8c27f8
21 changed files with 150 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ai/da/controller/LibraryController.java
View File

@@ -1,7 +1,5 @@
package com.ai.da.controller;
import cn.hutool.core.lang.Assert;
import cn.hutool.system.UserInfo;
import com.ai.da.common.config.FileProperties;
import com.ai.da.common.config.exception.BusinessException;
import com.ai.da.common.context.UserContext;
@@ -17,7 +15,6 @@ import com.ai.da.model.vo.*;
import com.ai.da.service.LibraryModelPointService;
import com.ai.da.service.LibraryService;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;