From a88e19be56fab4f06aae0248575b55fed41eaa1e Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 04 一月 2024 09:47:20 +0800
Subject: [PATCH] yxh

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java |   79 +++++++++++++++++++++++++++++----------
 1 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
index 7b19381..d776cbf 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java
@@ -1,102 +1,139 @@
 package com.ruoyi.project.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 鎹愮尞鍣ㄥ畼瀵硅薄 service_donorchargeorgan
- * 
+ *
  * @author ruoyi
  * @date 2023-12-25
  */
 @Data
 @ApiModel("鎹愮尞鍣ㄥ畼")
-public class ServiceDonorchargeorgan extends BaseEntity
-{
+public class ServiceDonorchargeorgan 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_donorcharge琛ㄧ殑ID
+     */
+    @ApiModelProperty("鍏宠仈service_donorcharge琛ㄧ殑ID")
+    @Excel(name = "鍏宠仈service_donorcharge琛ㄧ殑ID")
+    private Long donorchargeid;
+
+    /**
+     * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+     */
     @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
     @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
     private Long infoid;
 
-    /** 鎹愮尞浜哄悕瀛� */
+    /**
+     * 鎹愮尞浜哄悕瀛�
+     */
     @ApiModelProperty("鎹愮尞浜哄悕瀛�")
     @Excel(name = "鎹愮尞浜哄悕瀛�")
     private String donorname;
 
-    /** 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+    /**
+     * 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+     */
     @ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
     @Excel(name = "鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
     private String hospitalname;
 
-    /** 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+    /**
+     * 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+     */
     @ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
     @Excel(name = "鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
     private String hospitalno;
 
-    /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀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 BigDecimal organcharge;
 
-    /** 璐圭敤褰曞叆鏃堕棿 */
+    /**
+     * 璐圭敤褰曞叆鏃堕棿
+     */
     @ApiModelProperty("璐圭敤褰曞叆鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "璐圭敤褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date organtime;
 
-    /** 璐圭敤褰曞叆浜� */
+    /**
+     * 璐圭敤褰曞叆浜�
+     */
     @ApiModelProperty("璐圭敤褰曞叆浜�")
     @Excel(name = "璐圭敤褰曞叆浜�")
     private String chargeoperator;
 
-    /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤 */
+    /**
+     * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤
+     */
     @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
     @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
     private BigDecimal amount;
 
-    /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿 */
+    /**
+     * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿
+     */
     @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date amounttime;
 
-    /** 鏀惰垂褰曞叆浜� */
+    /**
+     * 鏀惰垂褰曞叆浜�
+     */
     @ApiModelProperty("鏀惰垂褰曞叆浜�")
     @Excel(name = "鏀惰垂褰曞叆浜�")
     private String amountoperator;
 
-    /** 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮� */
+    /**
+     * 鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�
+     */
     @ApiModelProperty("鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
     @Excel(name = "鍣ㄥ畼璐圭敤鏀跺彇鐘舵�侊細0锛氭湭鏀跺彇锛�1锛氬凡鏀跺彇锛�2锛氭斁寮�")
     private Long chargestate;
 
-    /** 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑 */
+    /**
+     * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑
+     */
     @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
     @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
     private String organchargedesc;

--
Gitblit v1.9.3