diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java index b32b4b5..d59fbc1 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java @@ -2,6 +2,9 @@ package cn.org.gitlink.notification.model.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; @@ -15,14 +18,18 @@ public class SysNotification { private String content; + @JsonProperty("notification_url") private String notificationUrl; + @JsonProperty("created_at") + @JsonFormat(pattern = "yyyy-MM-dd HH:dd:ss") private Date createdAt; private Integer status; private Integer type; + @JsonIgnore private Integer isDelete; public Integer getId() { diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java index 26ac206..8b1eee0 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java @@ -17,6 +17,7 @@ public class ReceiverNotificationListVo { @JsonProperty("unread_atme") private Integer unreadAtMeCount; + @JsonProperty("notification_list") private List list; public ReceiverNotificationListVo() { diff --git a/model/src/main/resources/mapper/notification/SysNotificationMapper.xml b/model/src/main/resources/mapper/notification/SysNotificationMapper.xml index d6aea61..31c6c39 100644 --- a/model/src/main/resources/mapper/notification/SysNotificationMapper.xml +++ b/model/src/main/resources/mapper/notification/SysNotificationMapper.xml @@ -151,7 +151,7 @@