From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访

---
 ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskExport.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskExport.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskExport.java
index 457f2a0..40d5f28 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskExport.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/ServiceSubtaskExport.java
@@ -32,8 +32,8 @@
      * 绉戝鍚嶇О
      */
     @Excel(name = "绉戝鍚嶇О")
-    @ApiModelProperty(value = "绉戝鍚嶇О")
-    private String deptname;
+    @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О锛堝師 deptname锛屽垪宸叉敼鍚� leaveldeptname锛�")
+    private String leaveldeptname;
 
     /**
      * 鍙戦�佷汉
@@ -200,5 +200,12 @@
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
+    /**
+     * 鍖荤敓澶勭悊鎰忚
+     */
+    @Excel(name = "鍖荤敓澶勭悊鎰忚")
+    @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+    private String doctorOpinion;
+
 
 }

--
Gitblit v1.9.3