From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
index c93f070..1794c16 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/QRActivityCodeVO.java
@@ -13,13 +13,11 @@
@ApiModel
public class QRActivityCodeVO {
@ApiModelProperty("数据主键id")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+ private String id;
@ApiModelProperty("二维码类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
private Integer type;
@ApiModelProperty(value = "二维码id",example = "1")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long codeId;
+ private String codeId;
@ApiModelProperty("签到类型 1签到 2签退")
private Integer signType;
}
--
Gitblit v1.7.1