Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 e3c5378b79d23f4cebb4059c78bfbdd32cd5a2f9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -167,6 +167,15 @@
    @PostMapping("putuserisvolunteer")
    R putUserIsVolunteer(@RequestParam("phone") String phone,@RequestParam("type")int type);


    /**
     * 修改用户志愿者状态
     * @param userId 用户ID
     * @param type 1 支援者  0不是志愿者
     */
    @PostMapping("putuserisvolunteerbyid")
    R putUserIsVolunteerById(@RequestParam("userId") Long userId,@RequestParam("type")int type);

    /**
     * 用户绑定社区、小区
     * @param loginUserInfoVO 社区小区数据