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

chenhuan

2024-05-17 f95c2cc9d70420202c07d469b49303e7b3b0d094

 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";
    }