From 36d1b88a1cab6845ac8ccc8c24effae8c44086e7 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Wed, 5 Feb 2020 17:47:54 +0800 Subject: [PATCH] =?UTF-8?q?bug#5074=E5=AF=B9=E5=BA=94=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activity/controller/AppActInfoController.java | 8 +++----- .../epdc/modules/activity/service/ActInfoService.java | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java index 9eeae53d4..c482222f2 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java @@ -22,8 +22,6 @@ import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; @@ -43,7 +41,7 @@ import java.util.List; @RestController @RequestMapping("appactinfo") public class AppActInfoController { - + @Autowired private ActInfoService actInfoService; @@ -91,7 +89,7 @@ public class AppActInfoController { */ @GetMapping("detail") public Result getDetail(@RequestBody ActInfoAppFormDTO formDto) { - return this.actInfoService.getDetailByApp(formDto); + return this.actInfoService.queryActInfoDetail(formDto); } /** @@ -117,4 +115,4 @@ public class AppActInfoController { return this.actInfoService.getCancelDetailByApp(id); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index 2210b3fe8..4dad96cf4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java @@ -96,6 +96,7 @@ public interface ActInfoService extends BaseService { * @Author: liuchuang * @Date: 2019/9/10 20:54 */ + @Deprecated Result getDetailByApp(ActInfoAppFormDTO formDto); /**