Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -44,6 +44,41 @@
    private Date createAt;

    /**
     * 开始时间
     */
    private Date startTime;

    /**
     * 结束时间
     */
    private Date endTime;

    /**
     * 奖励积分
     */
    private Integer award;

    /**
     * 签到位置
     */
    private String position;

    /**
     * 签到次数
     */
    private Integer times;

    /**
     * 二维码id
     */
    private Integer codeId;

    /**
     * 活动类型 1居民，志愿者 2党员
     */
    private Integer type;

    /**
    * 是否是志愿者 0 否 1 是
    */
    private Integer isVolunteer;