From c20c99f256e2f47bd45f0b48fb6b1bcc83960f1e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 21 三月 2024 14:22:13 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java |   61 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 6 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 e7e585f..db78a53 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,16 +1,18 @@
 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.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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
@@ -31,12 +33,18 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑ID")
+    private Long paymentid;
+
+    @ApiModelProperty("鍏宠仈service_donorpayment琛ㄧ殑paymentno")
+    private String paymentno;
+
     /**
      * 鍏宠仈service_donorcharge琛ㄧ殑ID
      */
     @ApiModelProperty("鍏宠仈service_donorcharge琛ㄧ殑ID")
-    //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
-    private Long donorchargelD;
+    @Excel(name = "鍏宠仈service_donorcharge琛ㄧ殑ID")
+    private Long donorchargeid;
 
     /**
      * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
@@ -118,6 +126,13 @@
     private Date amounttime;
 
     /**
+     * 鎺ユ敹鏃ユ湡
+     */
+    @ApiModelProperty("鎺ユ敹鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date receiveTime;
+
+    /**
      * 鏀惰垂褰曞叆浜�
      */
     @ApiModelProperty("鏀惰垂褰曞叆浜�")
@@ -138,5 +153,39 @@
     @Excel(name = "鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
     private String organchargedesc;
 
+    /**
+     * 浜嬩欢缂栧彿
+     */
+    @ApiModelProperty("浜嬩欢缂栧彿")
+    @Excel(name = "浜嬩欢缂栧彿")
+    private String caseno;
+
+    /**
+     * 濮撳悕
+     */
+    @ApiModelProperty("濮撳悕")
+    @Excel(name = "濮撳悕")
+    private String name;
+
+    /**
+     * 绁ㄦ嵁闄勪欢
+     */
+    @ApiModelProperty("绁ㄦ嵁闄勪欢")
+    @Excel(name = "绁ㄦ嵁闄勪欢")
+    private String annexFiles;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty("澶囨敞")
+    @TableField(exist = false)
+    private Boolean paymentidIsNotNull = true;
+
+    /**
+     * 鐘舵�侊紙0姝e父 1鍒犻櫎锛�
+     */
+    @ApiModelProperty("鐘舵�侊紙0姝e父 1鍒犻櫎锛�")
+    private Integer delFlag;
+
 }
 

--
Gitblit v1.9.3