From 0fc9760cf60f30e070c9e1ddb39dff0fe0fb5f91 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 22:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/PartyMember.java | 20 ++++++++++++++++++--
1 files changed, 18 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 7415322..1199e69 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
@@ -1,5 +1,6 @@
package com.panzhihua.sangeshenbian.model.entity;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDateTime;
@@ -10,11 +11,14 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.checkerframework.checker.units.qual.A;
/**
* <p>
@@ -34,7 +38,8 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键id")
- @TableId(value = "id", type = IdType.NONE)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "姓名")
@@ -42,6 +47,9 @@
@ApiModelProperty(value = "性别 1：男 0：女")
private Integer gender;
+
+ @ApiModelProperty(value = "身份证号")
+ private String idNumber;
@ApiModelProperty(value = "电话")
private String phone;
@@ -62,10 +70,11 @@
private String community;
@ApiModelProperty(value = "社区ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
@ApiModelProperty(value = "服务对象")
- private String serviceObject;
+ private String serviceTarget;
@ApiModelProperty(value = "所在党组织")
private String partyOrganization;
@@ -78,6 +87,9 @@
@ApiModelProperty(value = "冻结状态 1:已冻结 0：正常中")
private Integer freezeStatus;
+
+ @ApiModelProperty(value = "是否确认党员信息")
+ private Integer isConfirm;
@ApiModelProperty(value = "拒绝理由")
private String refuseReason;
@@ -99,7 +111,11 @@
private Long updateBy;
@ApiModelProperty(value = "删除标志 1：是 0：否")
+ @TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "添加来源 0：小程序； 1：管理后台")
+ private Integer source;
+
}
--
Gitblit v1.7.1