From d4e3d2ce70f38f5a41ce336e62102e4da8698ba1 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:05:30 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   13 +++++++++++++
 1 files changed, 13 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 3106aa7..1e28143 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,6 +11,7 @@
 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;
@@ -44,6 +45,7 @@
     private UserService userService;
     @Resource
     private SysUserInputService sysUserInputService;
+
 
     /**
      * 新增微信用户
@@ -1469,4 +1471,15 @@
     }
 
 
+    @GetMapping("/accept")
+    public R accept(@RequestParam("userId")Long userId){
+        return userService.accept(userId);
+    }
+
+    @PostMapping("/addComPbCheckUser")
+    public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){
+        return userService.addComPbCheckUser(comPbCheckUserDTO);
+    }
+
+
 }

--
Gitblit v1.7.1