From 584431221914d207c011755d0e325c0e59c997d6 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 06 七月 2022 17:52:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index c1d90b0..6375eea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -10,6 +10,8 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.PageDTO;
@@ -1356,6 +1358,16 @@
return userService.uuLogin(uuLoginVO);
}
+ @PostMapping("/indexData")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选",dataType = "Integer"),
+ @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
+ })
+ public R indexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "type",required = false) Long streetId){
+ return userService.newIndexData(type,streetId);
+ }
+
/**
*导出验证密码
*/
--
Gitblit v1.7.1