Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 12b76fe84f792ab19f47b7cd4e52296a0cc94084

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -13,6 +13,7 @@
import com.panzhihua.service_user.service.SysUserInputService;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -191,6 +192,16 @@
    }

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

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