Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-03 33fdf147bdaa73d2f97479d809597a99ad50a8bb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAnnouncement.java

@@ -4,6 +4,8 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -31,6 +33,7 @@
    private static final long serialVersionUID = -26741210716448548L;

    @TableId(type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
@@ -55,6 +58,7 @@
     * 通知类型id
     */
    @ApiModelProperty(value = "通知类型id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long columnId;

    /**