Merge remote-tracking branch 'origin/master'

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java

@@ -56,30 +56,22 @@ public interface RemoteUserService {
 
     /**
      * 通过用户id查询用户、角色信息
-     *
-     * @param userId 用户名
-     * @return R
      */
     @NoToken
+    @GetMapping("/user/inner/get-by-user-id")
+    R<UserInfo> getInnerByUserId(@RequestParam("userId") Long userId);
+
     @GetMapping("/user/get-by-user-id")
     R<UserInfo> getByUserId(@RequestParam("userId") Long userId);
 
     /**
      * 通过姓名和手机号查询用户、角色信息
-     *
-     * @param name
-     * @param mobile
-     * @return
      */
-    @NoToken
     @GetMapping("/user/get-name-and-mobile")
     R<UserInfo> getUserByNameAndMobile(@RequestParam("name") String name, @RequestParam("mobile") String mobile);
 
     /**
      * 根据用户ID获取用户
-     *
-     * @param userIds ID
-     * @return SysUser
      */
     @PostMapping("/user/list")
     R<List<SysUser>> getUserById(@RequestBody List<Long> userIds);