From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 28 八月 2024 09:22:52 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java index 7801a67..504191b 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java @@ -1,7 +1,6 @@ package com.doumee.api.common; import com.alibaba.fastjson.JSONObject; -import com.doumee.api.BaseController; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.utils.Constants; @@ -9,13 +8,14 @@ import com.doumee.core.utils.FtpUtil; import com.doumee.core.utils.aliyun.ALiYunUtil; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.commons.CommonsMultipartResolver; @@ -31,6 +31,7 @@ import java.util.Map; import java.util.UUID; +import com.doumee.api.BaseController; /** * @author Eva.Caesar Liu * @date 2023/02/14 11:14 -- Gitblit v1.9.3