Merge branch 'test' into 'test_bak'

罗元桥

2021-09-09 23f22cc73e57133eb18e40d260f49bbd1bb9c221

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

@@ -92,9 +92,8 @@
    @ApiModelProperty("是否二维码签到 1 是 0否")
    private Integer isQrCode;

    @ApiModelProperty("用户最近签到时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date activitySignInDate;
    @ApiModelProperty("用户签到记录列表")
    private List<ComActActRegistVO> activitySignInList;

    @ApiModelProperty("联系人姓名")
    private String contactName;