From ad723be9b0bd0977619caf5ce31b91d04116c70e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 07 七月 2021 10:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 08a711a..5ec4473 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -11,12 +11,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
-import com.panzhihua.common.model.vos.community.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.PageComActMessageVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -83,6 +78,13 @@
return communityService.addEasyPhoto(comActEasyPhotoVO);
}
+ @ApiOperation(value = "查询随手拍是否有活动",response = ComActEasyPhotoActivityVO.class)
+ @PostMapping("getEasyPhotoActivity")
+ public R getEasyPhotoActivity (){
+ Long communityId = this.getCommunityId();
+ return communityService.getEasyPhotoActivity(communityId);
+ }
+
@ApiOperation(value = "随手拍详情",response =ComActEasyPhotoVO.class )
@GetMapping("detaileasyphoto")
@ApiImplicitParam(name = "id",value = "随手拍主键")
--
Gitblit v1.7.1