From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
index 2ebd80f..ae9d382 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
@@ -1,19 +1,20 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtBusinessDetailVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.service.community.CommunityService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
* @description: 社区便民服务商家接口
@@ -29,18 +30,17 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询便民服务商家",response = ComCvtBusinessVO.class)
+ @ApiOperation(value = "分页查询便民服务商家", response = ComCvtBusinessVO.class)
@PostMapping("/business/area/page")
public R pageComCvtBusiness(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
comCvtBusinessAppletsDTO.setCommunityId(loginUserInfo.getCommunityId());
}
return communityService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
}
-
- @ApiOperation(value = "查询便民服务商家详情",response = ComCvtBusinessDetailVO.class)
+ @ApiOperation(value = "查询便民服务商家详情", response = ComCvtBusinessDetailVO.class)
@GetMapping("/business/get")
public R getComCvtBusinessServeDetail(@RequestParam("id") Long id) {
return communityService.getComCvtBusinessServeDetail(id);
--
Gitblit v1.7.1