From 5dcd6447f315e821727508cd26bf05f8220b39c8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 13:54:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java
index 176d723..2bab8d4 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskDetailTrace.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -205,6 +206,12 @@
      */
     @ApiModelProperty("鍖呭惈鎮h�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
     @Excel(name = "鍖呭惈鎮h�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
+    private JSONObject patdescJson;
+    /**
+     * 鍖呭惈鎮h�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑
+     */
+    @ApiModelProperty("鍖呭惈鎮h�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
+    @Excel(name = "鍖呭惈鎮h�呭鍚嶃�佹偅鑰呯數璇濄�佸氨璇婄瀹ょ瓑")
     private String patdesc;
 
     /**

--
Gitblit v1.9.3