Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-09-22 1775bb71f952106c58657cf02891cbe2a286c8f8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPictureDO.java

@@ -33,6 +33,11 @@
    private Long activityId;

    /**
     * 类型（1.党建 2.节日 3.天气预报 4.疫情 5.灾害预警 6.志愿者）
     */
    private Integer type;

    /**
    * 用户id, 和用户信息表的相关id关联
    */
    private Long userId;
@@ -53,15 +58,9 @@
    */
    private String pictureName;

@Override
public String toString() {
        return "ComActActPictureDO{" +
                "id=" + id +
                ", activityId=" + activityId +
                ", userId=" + userId +
                ", createAt=" + createAt +
                ", uploadPicture=" + uploadPicture +
                ", pictureName=" + pictureName +
        "}";
        }
    /**
     * 是否系统预置（1.是 0.否）
     */
    private Integer sysFlag;

}