From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 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 2392cc7..ac658c3 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
@@ -90,6 +90,14 @@
     private String organname;
 
     /**
+     * 浠樻鍣ㄥ畼鍚嶇О
+     */
+    @ApiModelProperty("浠樻鍣ㄥ畼鍚嶇О")
+    @Excel(name = "浠樻鍣ㄥ畼鍚嶇О")
+    @TableField("pay_organ_name")
+    private String payOrganName;
+
+    /**
      * 鍣ㄥ畼搴旀敹璐圭敤
      */
     @ApiModelProperty("鍣ㄥ畼搴旀敹璐圭敤")
@@ -218,9 +226,16 @@
     /**
      * 鍣ㄥ畼鐘舵��
      */
-    @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
-    @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2澶卞姛銆�3搴撳瓨銆�4宸茬Щ妞嶃��5寮冪敤銆�6鐩寸郴鍏嶉櫎銆�7涓嶈壇浜嬩欢")
+    @ApiModelProperty("鍣ㄧ鐘舵�侊細1绉绘銆�2寮冪敤銆�3搴撳瓨銆�4澶卞姛銆�5鐩寸郴鍏嶉櫎銆�6涓嶈壇浜嬩欢")
+    @Excel(name = "鍣ㄧ鐘舵�侊細1绉绘銆�2寮冪敤銆�3搴撳瓨銆�4澶卞姛銆�5鐩寸郴鍏嶉櫎銆�6涓嶈壇浜嬩欢")
     private String organState;
+
+    /**
+     * 鍥炴鐘舵�佹煡璇紙宸蹭粯/鏈粯锛岄潪鏁版嵁搴撳瓧娈碉級
+     */
+    @ApiModelProperty("鍥炴鐘舵�佹煡璇細宸蹭粯銆佹湭浠�")
+    @TableField(exist = false)
+    private String payStatus;
 
     /**
      * 鍣ㄥ畼鐘舵��
@@ -232,5 +247,12 @@
     @ApiModelProperty("鏌ヨ鎵�鏈�")
     @TableField(exist = false)
     private Boolean selectAll = false;
+
+    /**
+     * 鏄惁鍙煡璇㈠洖娆惧尰闄紙HospitalNo锛変负绌虹殑鏁版嵁
+     */
+    @ApiModelProperty("鏄惁鍙煡璇㈠洖娆惧尰闄负绌虹殑鏁版嵁")
+    @TableField(exist = false)
+    private Boolean hospitalnoIsNull = false;
 }
 

--
Gitblit v1.9.3