update 平台发消息功能上线

jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java

@@ -11,6 +11,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 系统通告表
@@ -158,4 +159,9 @@ public class SysAnnouncement implements Serializable {
      * 跳转参数
      */
     private String jumpParameter;
+
+    /**截止时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private java.util.Date deadline;
 }

jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java

@@ -45,9 +45,4 @@ public class SysAnnouncementSend implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
-
-	/**截止时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date deadline;
 }

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -47,7 +47,7 @@
 		and sa.del_flag = '0'
 		and sas.user_id = #{announcementSendModel.userId}
 		<if test="announcementSendModel.deadline != null">
-			and sas.deadline &lt;= #{announcementSendModel.deadline}
+			and sa.deadline &lt;= #{announcementSendModel.deadline}
 		</if>
 		<if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
 			and sa.titile = #{announcementSendModel.titile}