diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 5acc6d0..0291545 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -27,7 +27,7 @@ 8.2.0 - + 5.9.0 1.9 @@ -100,13 +100,7 @@ com.github.oshi oshi-core - 5.3.6 - - - - net.java.dev.jna - jna - 5.6.0 + 5.0.1 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java index 9b10d3a..b5a8daa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,6 +18,7 @@ import java.io.Serializable; **/ @Data @Builder +@AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("sys_notice") public class SysNotice implements Serializable { diff --git a/nladmin-ui/src/views/system/notice/NoticeIcon.vue b/nladmin-ui/src/views/system/notice/NoticeIcon.vue index 63f50b9..4ae56e9 100644 --- a/nladmin-ui/src/views/system/notice/NoticeIcon.vue +++ b/nladmin-ui/src/views/system/notice/NoticeIcon.vue @@ -101,7 +101,7 @@ export default { */ toSiteMessage() { this.$router.push({ - path: '/monitor/notice' + path: '/monitor/sysNotice' }) this.visible = false },