Merge branch 'hemenkou_dev' into dev

101captain

2022-02-21 5a278a0965b417e7f39e8c209e2ff401f415066a

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

@@ -8,10 +8,12 @@
 * @author zzj
 */
@Data
@ApiModel("生成二维码传参")
@ApiModel
public class QRActivityCodeVO {
    @ApiModelProperty("数据主键id")
    private Integer id;
    @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
    private Integer type;
    @ApiModelProperty(value = "二维码id",example = "1")
    private Long codeId;
}