code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict origin/master

Browse Source
This commit is contained in:
paulGao
2022-02-11 15:33:28 +08:00
parent 6409d0dc2d da6a17cd61
commit 5c78711d8e
216 changed files with 1473 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common-api/src/main/java/cn/lili/controller/common/UploadController.java
View File

@@ -5,7 +5,6 @@ import cn.lili.cache.Cache;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.properties.SystemSettingProperties;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
@@ -52,9 +51,6 @@ public class UploadController {
@Autowired
private Cache cache;
@Autowired
private SystemSettingProperties systemSettingProperties;
@ApiOperation(value = "文件上传")
@PostMapping(value = "/file")
public ResultMessage<Object> upload(MultipartFile file,