From 0135fa289418c5fd231fa4e7c60ee7b8f06f17a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:29:11 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java
index 7409b17..f8ce8a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java
@@ -18,6 +18,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.checkerframework.checker.units.qual.A;
/**
* <p>
@@ -69,6 +70,7 @@
private String community;
@ApiModelProperty(value = "社区ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
@ApiModelProperty(value = "服务对象")
@@ -86,17 +88,20 @@
@ApiModelProperty(value = "冻结状态 1:已冻结 0：正常中")
private Integer freezeStatus;
+ @ApiModelProperty(value = "是否确认党员信息")
+ private Integer isConfirm;
+
@ApiModelProperty(value = "拒绝理由")
private String refuseReason;
@ApiModelProperty(value = "创建时间")
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "更新时间")
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "创建人")
@@ -109,5 +114,8 @@
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "添加来源 0：小程序； 1：管理后台")
+ private Integer source;
+
}
--
Gitblit v1.7.1