Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 b1f91d23c01266dda8cad34aa866bcac741a21cf

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

@@ -131,7 +131,7 @@
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
//    @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @GetMapping("/getSysUserNoSY")
    @ApiOperation("查询未挂接三一车辆的4.0用户")
    public AjaxResult getSysUserNoSY()