From c8668a4a71987199e610781e7ac8cc02faa4f082 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 16 十二月 2025 22:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
index d8200f8..2647465 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
@@ -1,17 +1,21 @@
package com.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
/**
* <p>
- *
+ *
* </p>
*
* @author ojq
@@ -26,6 +30,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ private String fileName;
/**
* 鐥呯殑绫诲瀷
@@ -46,15 +52,21 @@
private String duration;
/**
+ * 澶勬柟
+ */
+ @TableField(exist = false)
+ private String prescription;
+
+ /**
* 涓尰
*/
- @Excel(name = "涓尰")
+ @Excel(name = "涓尰澶勬柟")
private String cmedical;
/**
* 瑗垮尰
*/
- @Excel(name = "瑗垮尰")
+ @Excel(name = "瑗垮尰澶勬柟")
private String wmedical;
/**
@@ -77,4 +89,36 @@
private String url;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ private Long familyId;
+
+ @TableField(exist = false)
+ private Integer ownData;
+
+ private Long shareId;
+
+ /**
+ * 鍙備笌鑰�
+ */
+ private String companion;
+
+ /**
+ * 鍙備笌鑰呭垪琛�
+ */
+ @TableField(exist = false)
+ private List<String> companionList;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @TableField(exist = false)
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @TableField(exist = false)
+ private Date happenEndTime;
}
--
Gitblit v1.9.1