Merge branch 'master' of http://git.yuntengiot.com/huang/thingsboard3.3.2 into localhost-cxy

 Conflicts:
	common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SysNoticeUserDTO.java
	dao/src/main/resources/mapper/SysNoticeUserMapper.xml

 package org.thingsboard.server.common.data.yunteng.dto;
 package org.thingsboard.server.common.data.yunteng.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -42,5 +43,6 @@ public class SysNoticeDTO extends TenantDTO {
   private String senderName;
   private String senderName;
 
 
   @ApiModelProperty(value = "发送时间")
   @ApiModelProperty(value = "发送时间")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private LocalDateTime senderDate;
   private LocalDateTime senderDate;
 }
 }

 package org.thingsboard.server.common.data.yunteng.dto;
 package org.thingsboard.server.common.data.yunteng.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
@@ -25,6 +26,7 @@ public class SysNoticeUserDTO extends TenantDTO {
   @ApiModelProperty(value = "阅读状态 0：未读 1：已读")
   @ApiModelProperty(value = "阅读状态 0：未读 1：已读")
   private String readStatus;
   private String readStatus;
   @ApiModelProperty(value = "阅读时间")
   @ApiModelProperty(value = "阅读时间")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   private LocalDateTime readDate;
   private LocalDateTime readDate;
   @ApiModelProperty(value = "通知类型")
   @ApiModelProperty(value = "通知类型")
   private SysNoticeTypeEnum type;
   private SysNoticeTypeEnum type;

@@ -23,6 +23,7 @@
             <result property="type" column="type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
             <result property="type" column="type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
             <result property="senderName" column="sender_name"/>
             <result property="senderName" column="sender_name"/>
             <result property="senderDate" column="sender_date"/>
             <result property="senderDate" column="sender_date"/>
+            <result property="title" column="title"/>
         </association>
         </association>
     </resultMap>
     </resultMap>
 
 
@@ -48,7 +49,8 @@
                sn.type AS      type,
                sn.type AS      type,
                sn.sender_name  sender_name,
                sn.sender_name  sender_name,
                sn.sender_date  sender_date,
                sn.sender_date  sender_date,
-               sn.id   AS      id
+               sn.id   AS      id,
+               sn.title AS     title
         FROM sys_notice_user snu
         FROM sys_notice_user snu
                  LEFT JOIN sys_notice sn ON sn.id = snu.notice_id
                  LEFT JOIN sys_notice sn ON sn.id = snu.notice_id
                  LEFT JOIN sys_user su ON snu.receiver_id = su.id
                  LEFT JOIN sys_user su ON snu.receiver_id = su.id
@@ -57,6 +59,7 @@
         <include refid="columns"/>
         <include refid="columns"/>
         WHERE
         WHERE
         snu.tenant_id = #{queryMap.tenantId}
         snu.tenant_id = #{queryMap.tenantId}
+        AND snu.status = '1'
         <if test="queryMap.type != null">
         <if test="queryMap.type != null">
             AND sn.type = #{queryMap.type}
             AND sn.type = #{queryMap.type}
         </if>
         </if>