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/ServiceSubtask.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 17b297f..c541fcd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -152,7 +152,7 @@
* 浠诲姟绫诲瀷(闂ㄨ瘖锛屼綇闄紝澶嶈瘖鈥�)
*/
@Excel(name = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛岄�氱煡锛堝鏁欙級")
- @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛屾満鍣ㄤ汉璇煶锛堥殢璁匡級 2锛岄棶鍗凤紱3锛屽鏁欙紱 4.閫氱煡)")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1锛岃闊筹紙闅忚锛� 2锛岄棶鍗凤紱3锛屽鏁欙紱 4.閫氱煡)")
private String type;
/**
@@ -669,4 +669,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
private Date continueTimeNext;
+
+ @ApiModelProperty(value = "鎵嬫湳璁板綍id 瀵瑰簲pat_med_operation_item.id")
+ private Long operationItemId;
}
--
Gitblit v1.9.3