Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 eb4cfe7327323367a08ac449ce838f95b2e96783

 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;


    /**
     * 新增微信用户
@@ -1477,4 +1479,15 @@
        return userService.removeExpertRole(phone);
    }

    @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);
    }


}