From 0d10bc99eec75672b049339399e4f762fbd9746e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
index 851d764..fdb7c2d 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
@@ -19,6 +19,14 @@
@Data
public class ServiceSubtaskExport extends BaseEntity {
private static final long serialVersionUID = 1L;
+//
+// /**
+// * 绉戝鍚嶇О
+// */
+// @Excel(name = "涓婚敭")
+// @ApiModelProperty(value = "涓婚敭")
+// private Long id;
+
/**
* 绉戝鍚嶇О
@@ -35,6 +43,40 @@
private String sendname;
/**
+ * 骞撮緞
+ */
+ @Excel(name = "骞撮緞 ")
+ @ApiModelProperty(value = "骞撮緞")
+ private Long age;
+
+ /**
+ * 鎬у埆
+ */
+ @ApiModelProperty(value = "鎬у埆")
+ private Long sex;
+
+ /**
+ * 鎬у埆
+ */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty(value = "鎬у埆")
+ private String sexName;
+
+ /**
+ * 灏辫瘖缂栧彿锛堝搴旂殑outhospno銆乮nhospno锛�
+ */
+// @Excel(name = "灏辫瘖缂栧彿")
+ @ApiModelProperty(value = "灏辫瘖缂栧彿锛堝搴旂殑outhospno銆乮nhospno锛�")
+ private String hospno;
+
+ /**
+ * 鐥呭巻鍙�
+ */
+ @Excel(name = "鐥呭巻鍙�")
+ @ApiModelProperty(value = "鎮ｈ�呯紪鍙凤紙鐥呭巻鍙凤級")
+ private String patno;
+
+ /**
* 鍑洪櫌鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
--
Gitblit v1.9.3