From 44127187247ab653f2bb2d542a2e08e8994774a5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:28:46 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 2eb419e..acb859c 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
@@ -11,7 +11,6 @@
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 com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -1471,6 +1470,7 @@
return userService.resetPassExpertOrIndustryCenter(account,password);
}
+
@GetMapping("/accept")
public R accept(@RequestParam("userId")Long userId){
return userService.accept(userId);
@@ -1481,11 +1481,5 @@
return userService.addComPbCheckUser(comPbCheckUserDTO);
}
- /**
- * 是否为专家登陆小程序
- * */
- @GetMapping("/isSanShuoExpert")
- public R isExpert(@RequestParam("number") String number){
- return communityService.isExpert(number);
- }
+
}
--
Gitblit v1.7.1