Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 ce950dea4aef933a12e78e4fe1f535ba9a83c3df

 src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java

@@ -13,7 +13,7 @@
    @Autowired
    private IUserService userService;

    @RequestMapping("/login")
    @GetMapping("/login")
    public String devices(String name, String passwd){
        User user = userService.getUser(name, passwd);
        if (user != null) {