From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 173 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 42 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index 445c868..79760af 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,180 +19,256 @@
*/
@Data
@ApiModel("鎹愮尞浜插睘纭")
-public class ServiceRelativesconfirmation extends BaseEntity
-{
+public class ServiceRelativesconfirmation extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 濮撳悕 */
+ /**
+ * 濮撳悕
+ */
@ApiModelProperty("濮撳悕")
@Excel(name = "濮撳悕")
private String name;
- /** 璇佷欢绫诲瀷 */
+ /**
+ * 璇佷欢绫诲瀷
+ */
@ApiModelProperty("璇佷欢绫诲瀷")
private Long idcardtype;
- /** 璇佷欢鍙风爜 */
+ /**
+ * 璇佷欢鍙风爜
+ */
@ApiModelProperty("璇佷欢鍙风爜")
@Excel(name = "璇佷欢鍙风爜")
private String idcardno;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ApiModelProperty("鑱旂郴鐢佃瘽")
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
- /** 鐜颁綇鍦板潃 */
+ /**
+ * 鐜颁綇鍦板潃
+ */
@ApiModelProperty("鐜颁綇鍦板潃")
@Excel(name = "鐜颁綇鍦板潃")
private String residenceaddress;
- /** 鐜颁綇鍦板潃鐪佷唬鐮� */
+ /**
+ * 鐜颁綇鍦板潃鐪佷唬鐮�
+ */
@ApiModelProperty("鐜颁綇鍦板潃鐪佷唬鐮�")
private String residenceprovince;
- /** 鐜颁綇鍦板潃鐪佸悕绉� */
+ /**
+ * 鐜颁綇鍦板潃鐪佸悕绉�
+ */
@ApiModelProperty("鐜颁綇鍦板潃鐪佸悕绉�")
@Excel(name = "鐜颁綇鍦板潃鐪佸悕绉�")
private String residenceprovincename;
- /** 甯傜紪鍙� */
+ /**
+ * 甯傜紪鍙�
+ */
@ApiModelProperty("甯傜紪鍙�")
private String residencecity;
- /** 甯傚悕绉� */
+ /**
+ * 甯傚悕绉�
+ */
@ApiModelProperty("甯傚悕绉�")
private String residencecityname;
- /** 鎵�灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("鎵�灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
private String residencetown;
- /** 鎵�灞炶閬擄紙闀囷級鍚嶇О */
+ /**
+ * 鎵�灞炶閬擄紙闀囷級鍚嶇О
+ */
@ApiModelProperty("鎵�灞炶閬擄紙闀囷級鍚嶇О")
private String residencetownname;
- /** 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夌紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecommunity;
- /** 绀惧尯锛堟潙锛夊悕绉� */
+ /**
+ * 绀惧尯锛堟潙锛夊悕绉�
+ */
@ApiModelProperty("绀惧尯锛堟潙锛夊悕绉�")
private String residencecommunityname;
- /** 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecountycode;
- /** 鎵�灞炲尯鍩熷悕绉� */
+ /**
+ * 鎵�灞炲尯鍩熷悕绉�
+ */
@ApiModelProperty("鎵�灞炲尯鍩熷悕绉�")
private String residencecountyname;
- /** 浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm */
+ /**
+ * 浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm
+ */
@ApiModelProperty("浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm")
@Excel(name = "浜插睘鍏崇郴,澶氶�� ;鍙烽殧寮� 鏍规嵁瀛楀吀sys_KinshipConfirm")
private String kinship;
- /** 瀛愬コ鏁伴噺 */
+ /**
+ * 瀛愬コ鏁伴噺
+ */
@ApiModelProperty("瀛愬コ鏁伴噺")
private Long kinshipChildrennum;
- /** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
+ /**
+ * 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
private String signfamilyrelations;
- /** 浜插睘鍏崇郴纭绛惧瓧 */
+ /**
+ * 浜插睘鍏崇郴纭绛惧瓧
+ */
@ApiModelProperty("浜插睘鍏崇郴纭绛惧瓧")
private String kinshipconfirmationsign;
- /** 鎹愮尞鍐冲畾 */
+ /**
+ * 鎹愮尞鍐冲畾
+ */
@ApiModelProperty("鎹愮尞鍐冲畾")
@Excel(name = "鎹愮尞鍐冲畾")
private String organdecision;
- /** 鍏朵粬 */
+ /**
+ * 鍏朵粬
+ */
@ApiModelProperty("鍏朵粬")
private String organdecisionOther;
- /** 浜插睘纭绛惧瓧 */
+ /**
+ * 浜插睘纭绛惧瓧
+ */
@ApiModelProperty("浜插睘纭绛惧瓧")
private String relativeconfirmationsign;
- /** 涓庢崘璧犺�呭叧绯� */
+ /**
+ * 涓庢崘璧犺�呭叧绯�
+ */
@ApiModelProperty("涓庢崘璧犺�呭叧绯�")
private String familyrelations;
- /** 鑾峰彇缁勭粐缂栧彿 */
+ /**
+ * 鑾峰彇缁勭粐缂栧彿
+ */
@ApiModelProperty("鑾峰彇缁勭粐缂栧彿")
private String acquisitiontissueno;
- /** 鑾峰彇缁勭粐鍚嶇О */
+ /**
+ * 鑾峰彇缁勭粐鍚嶇О
+ */
@ApiModelProperty("鑾峰彇缁勭粐鍚嶇О")
private String acquisitiontissuename;
- /** 璐熻矗浜虹紪鍙� */
+ /**
+ * 璐熻矗浜虹紪鍙�
+ */
@ApiModelProperty("璐熻矗浜虹紪鍙�")
private String responsibleuserid;
- /** 璐熻矗浜哄鍚� */
+ /**
+ * 璐熻矗浜哄鍚�
+ */
@ApiModelProperty("璐熻矗浜哄鍚�")
@Excel(name = "璐熻矗浜哄鍚�")
private String responsibleusername;
- /** 鍗忚皟鍛樼瀛�1 */
+ /**
+ * 鍗忚皟鍛樼瀛�1
+ */
@ApiModelProperty("鍗忚皟鍛樼瀛�1")
@Excel(name = "鍗忚皟鍛樼瀛�1")
private String coordinateduserido;
- /** 鑱旂粶浜轰竴濮撳悕 */
+ /**
+ * 鑱旂粶浜轰竴濮撳悕
+ */
@ApiModelProperty("鑱旂粶浜轰竴濮撳悕")
private String coordinatedusernameo;
- /** 鍗忚皟鍛樼瀛�2 */
+ /**
+ * 鍗忚皟鍛樼瀛�2
+ */
@ApiModelProperty("鍗忚皟鍛樼瀛�2")
@Excel(name = "鍗忚皟鍛樼瀛�2")
private String coordinateduseridt;
- /** 鑱旂粶浜轰簩濮撳悕 */
+ /**
+ * 鑱旂粶浜轰簩濮撳悕
+ */
@ApiModelProperty("鑱旂粶浜轰簩濮撳悕")
private String coordinatedusernamet;
- /** 涓撹亴浜哄憳缂栧彿 */
+ /**
+ * 涓撹亴浜哄憳缂栧彿
+ */
@ApiModelProperty("涓撹亴浜哄憳缂栧彿")
private String operatorno;
- /** 涓撹亴浜哄憳濮撳悕 */
+ /**
+ * 涓撹亴浜哄憳濮撳悕
+ */
@ApiModelProperty("涓撹亴浜哄憳濮撳悕")
private String operatorname;
- /** 绛剧讲鏃ユ湡 */
+ /**
+ * 绛剧讲鏃ユ湡
+ */
@ApiModelProperty("绛剧讲鏃ユ湡")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
- /** 姘戞棌 */
+ /**
+ * 姘戞棌
+ */
@ApiModelProperty("姘戞棌")
private String nation;
-
- /** 瀛﹀巻 */
+ /**
+ * 瀛﹀巻
+ */
@ApiModelProperty("瀛﹀巻")
private String education;
@@ -200,5 +277,17 @@
*/
@ApiModelProperty("鑱屼笟")
private String occupation;
+
+ /**
+ * 闄勪欢
+ */
+ @ApiModelProperty("闄勪欢")
+ private String assessannex;
+
+ /**
+ * 瀹跺睘鎰忚澶囨敞
+ */
+ @ApiModelProperty("瀹跺睘鎰忚澶囨敞")
+ private String relativeRemark;
}
--
Gitblit v1.9.3