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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

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

@@ -61,4 +61,10 @@
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 二维码类型 1居民志愿者 2党员
     */
    @ApiModelProperty("二维码类型 1居民志愿者 2党员")
    private Integer type;

}