Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-16 df9586ac7f3abd90d7b2aec871c7e6ac3d829d94

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java

@@ -36,7 +36,8 @@

    @RequiresPermissions("geo:deviceLog:view")
    @GetMapping()
    public String deviceLog() {
    public String deviceLog(String id, ModelMap mmap) {
        mmap.put("projectId", id);
        return prefix + "/deviceLog";
    }