From 11bc9c5453ef32df0be2c3d9c549b04910b8fbca Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 03 六月 2025 17:10:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java index 571c1f7..4683837 100644 --- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java +++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java @@ -157,7 +157,14 @@ */ @Excel(name = "鐤剧梾鍚嶇О") @ApiModelProperty("鐤剧梾鍚嶇О") - private String icdName; + private String leavediagname; + + /** + * 鐤剧梾鍚嶇О + */ + @Excel(name = "鐤剧梾鍚嶇О") + @ApiModelProperty("鐤剧梾鍚嶇О") + private String leaveicd10code; /** * 鎵嬫満鍙� @@ -207,9 +214,9 @@ /** * 鍙戦�佹椂闂� */ - @Excel(name = "灏辫瘖鏃堕棿") + @Excel(name = "鍙戦�佹椂闂�") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("灏辫瘖鏃堕棿") + @ApiModelProperty("鍙戦�佹椂闂�") private Date visitTime; -- Gitblit v1.9.3