From cb22e2441394cd61116d64a844708ca9390a0529 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 21 七月 2024 18:43:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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..91b6fab 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
@@ -1,13 +1,16 @@
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;
/**
* <p>
@@ -46,15 +49,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 +86,13 @@
private String url;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ private Long familyId;
+
+ @TableField(exist = false)
+ private Integer ownData;
+
+ private Long shareId;
}
--
Gitblit v1.9.1