Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 dd8aa15e284c9d4c0c858e22f4130d1785261e01

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java

@@ -12,7 +12,7 @@
public class QRActivityCodeVO {
    @ApiModelProperty("数据主键id")
    private Integer id;
    @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
    @ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
    private Integer type;
    @ApiModelProperty(value = "二维码id",example = "1")
    private Long codeId;