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

张天森

2022-07-08 c640b18fae716de628b2a2b4d43f6869f3ab83ff

 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;

}