Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/modules/announcement/entity/Announcement.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -21,6 +24,7 @@ public class Announcement implements Serializable {
      *
      */
 //    @TableId
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

src/main/java/com/sqx/modules/common/dto/DeleteAnnouncementDTO.java

@@ -8,5 +8,5 @@ import javax.validation.constraints.NotNull;
 @Data
 public class DeleteAnnouncementDTO {
     @NotNull
-    private Integer id;
+    private Long id;
 }

src/main/java/com/sqx/modules/common/dto/UpdateAnnouncementDTO.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class UpdateAnnouncementDTO {
     @NotNull
-    private Integer id;
+    private Long id;
     private String title;
     private String content;
     private Integer state;