Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 0655da5ce12155f0e02fc548d697a6124d03b85b

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

@@ -34,7 +34,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

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

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

}