From 1ff85b6e1210b47d4790f866ba59fd50600b3fb4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 10:49:46 +0800
Subject: [PATCH] 修改代码

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java |   98 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
index 27a7947..0b24198 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.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;
@@ -12,114 +13,161 @@
 
 /**
  * 鎹愮尞鍣ㄥ畼鑾峰彇瀵硅薄 service_donationwitnessorgan
- * 
+ *
  * @author ruoyi
  * @date 2023-12-25
  */
 @Data
 @ApiModel("鎹愮尞鍣ㄥ畼鑾峰彇")
-public class ServiceDonationwitnessorgan extends BaseEntity
-{
+public class ServiceDonationwitnessorgan 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")
     @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
     private Long infoid;
 
-    /** 鎹愮尞鑰呯紪鍙� */
+    /**
+     * 鎹愮尞鑰呯紪鍙�
+     */
     @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
     @Excel(name = "鎹愮尞鑰呯紪鍙�")
     private String donorno;
 
-    /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ */
+    /**
+     * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+     */
     @ApiModelProperty("鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
     @Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
     private String organno;
 
-    /** 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ */
+    /**
+     * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+     */
     @ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
     @Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
     private String organname;
 
-    /** 鍣ㄥ畼缂栧彿  */
+    /**
+     * 鍣ㄥ畼缂栧彿
+     */
     @ApiModelProperty("鍣ㄥ畼缂栧彿 ")
     @Excel(name = "鍣ㄥ畼缂栧彿 ")
     private String organnumber;
 
-    /** 鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢� */
+    /**
+     * 鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢�
+     */
     @ApiModelProperty("鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢�")
     @Excel(name = "鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢�")
     private String organstate;
 
-    /** 鏈幏鍙栧師鍥� */
+    /**
+     * 鏈幏鍙栧師鍥�
+     */
     @ApiModelProperty("鏈幏鍙栧師鍥�")
     @Excel(name = "鏈幏鍙栧師鍥�")
     private String notgetreason;
 
-    /** 鍣ㄥ畼鑾峰彇鏃堕棿 */
-    @ApiModelProperty("鍣ㄥ畼鑾峰彇鏃堕棿")
+    /**
+     * 绂讳綋鏃堕棿
+     */
+    @ApiModelProperty("绂讳綋鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "鍣ㄥ畼鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "绂讳綋鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date organgettime;
 
-    /** 鍖荤敓濮撳悕 */
+    /**
+     * 鎵嬫湳寮�濮嬫椂闂�
+     */
+    @ApiModelProperty("鍣ㄥ畼鑾峰彇寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍣ㄥ畼鑾峰彇寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date organStartTime;
+
+    /**
+     * 鍖荤敓濮撳悕
+     */
     @ApiModelProperty("鍖荤敓濮撳悕")
     @Excel(name = "鍖荤敓濮撳悕")
     private String organgetdoct;
 
-    /** 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+    /**
+     * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+     */
     @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
     @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
     private String gainhospitalno;
 
-    /** 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+    /**
+     * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+     */
     @ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
     @Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
     private String gainhospitalname;
 
-    /** 鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1 */
+    /**
+     * 鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1
+     */
     @ApiModelProperty("鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1")
     @Excel(name = "鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1")
     private String isbiopsybefore;
 
-    /** 鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1 */
+    /**
+     * 鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1
+     */
     @ApiModelProperty("鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1")
     @Excel(name = "鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1")
     private String isbiopsyafter;
 
-    /** 灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1 */
+    /**
+     * 灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1
+     */
     @ApiModelProperty("灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1")
     @Excel(name = "灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1")
     private String ismarginalorgan;
 
-    /** 鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1 */
+    /**
+     * 鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1
+     */
     @ApiModelProperty("鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1")
     @Excel(name = "鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1")
     private String ispathogenpositive;
 
-    /** 鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1 */
+    /**
+     * 鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1
+     */
     @ApiModelProperty("鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1")
     @Excel(name = "鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1")
     private String ispnf;
 
-    /** 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1 */
+    /**
+     * 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1
+     */
     @ApiModelProperty("鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
     @Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
     private String isdgf;
 
-    /** 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1 */
+    /**
+     * 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1
+     */
     @ApiModelProperty("鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
     @Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
     private String name;
 
-    /** 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1 */
+    /**
+     * 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1
+     */
     @ApiModelProperty("鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
     @Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
     private String caseno;

--
Gitblit v1.9.3