Merge branch 'volunteer_lyq' into 'dev'

罗元桥

2022-02-18 90de589a0964981f05b1571e441110130f35f4b8

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

@@ -224,7 +224,7 @@
     * @return 人员详情
     */
    @PostMapping("detailuser")
    R detailUser(@RequestParam("userId") Long userId);
    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);

    /**
     * 设置用户标签