Merge branch 'dev' into dev_zj

zss

2025-02-20 5101e344b4ac9de94d0f18d8a501158be49221ff

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java

@@ -25,11 +25,27 @@
    @Resource
    private UserService userService;

    /**
     * type : 1: 获取检测人员信息
     * @param user
     * @param type
     * @return
     */
    @ApiOperation(value = "根据条件获取用户列表")
    @GetMapping("/selectUserCondition")
    public Result selectUserCondition(User user, String type){
        return Result.success(userService.selectUserCondition(user, type));
    }

    /**
     * 获取当前登录的客户信息
     * @return
     */
    @GetMapping("/getUserNow")
    @ApiOperation(value = "获取当前登录的客户信息")
    public Result<?> getUserNow(){
        return Result.success(userService.getUserNow());
    }

}