Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-09 b5ae703a499b97fd83dd9a7b67a10a7b8157df5f

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java

@@ -131,13 +131,13 @@
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    /*@PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @GetMapping("/getSysUserNoSY")
    @ApiOperation("查询未挂接三一车辆的4.0用户")
    public AjaxResult getSysUserNoSY()
    {
        //startPage();
        startPage();
        List<SysUser> list = ardSyUserService.getSysUserNoSY();
        return success(list);
    }*/
    }
}