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

huanghongfa

2021-10-22 3389e27613953cf3d7d06653139bf902e08736dc

 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;