From caefe9a9cc486247f831e46356b0b03ca450fdf9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 25 二月 2022 10:14:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 a03b347..8f9024e 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
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -343,7 +344,7 @@
return R.ok(Constants.IS_SHOP_OPEN);
}
- @ApiOperation(value = "获取最新活动和用户最新收益", response = ComActEasyPhotoRewardVO.class)
+ @ApiOperation(value = "获取最新活动和用户最新收益", response = BannerVO.class)
@GetMapping("getUserReward")
public R getUserReward(@RequestParam("communityId") Long communityId) {
Long userId = 0L;
@@ -376,6 +377,6 @@
@ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
@GetMapping("easyphoto/classify/list")
public R easyPhotoClassifyList() {
- return communityService.listPhotoClassify();
+ return communityService.listPhotoClassify(this.getAreaCode());
}
}
--
Gitblit v1.7.1