From ebbce5c35942648041e6f10be550c1c046e8c474 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng>
Date: Tue, 20 Jun 2023 16:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88=E7=9A=84?=
=?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/system/entity/GardsStations.java | 1 +
.../controller/AlarmSysUserController.java | 39 -------------------
2 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644 jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java
diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
index 898e238d..8966904d 100644
--- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
+++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
@@ -52,6 +52,7 @@ public class GardsStations implements Serializable {
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
}
diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java
deleted file mode 100644
index e4c4cc75..00000000
--- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.modules.controller;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static org.apache.commons.collections.CollectionUtils.collect;
-
-@RestController
-@RequestMapping("alarmSysUser")
-public class AlarmSysUserController {
-
- @Resource
- private SysUserMapper sysUserMapper;
- @Resource
- private SysUserRoleMapper sysUserRoleMapper;
- @Resource
- private SysRoleMapper sysRoleMapper;
- @Resource
- private SysDictItemMapper sysDictItemMapper;
- @Resource
- private GardsDetectorsMapper gardsDetectorsMapper;
-
-
-
-
-}