From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
index 7c6daa1..e465397 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSysAppUser.java
@@ -9,6 +9,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -34,14 +35,18 @@
@TableField("nick_name")
private String nickName;
+ @ApiModelProperty(value = "头像")
+ @TableField("avatar")
+ private String avatar;
+
@ApiModelProperty(value = "手机号")
@TableField("phone")
private String phone;
@ApiModelProperty(value = "出生日期")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("birth_time")
- private LocalDateTime birthTime;
+ private LocalDate birthTime;
@ApiModelProperty(value = "性别 1=男 2=女")
@TableField("sex")
@@ -51,6 +56,10 @@
@TableField("open_id")
private String openId;
+ @ApiModelProperty(value = "公众号openId")
+ @TableField("office_open_id")
+ private String officeOpenId;
+
@ApiModelProperty(value = "慢性病id，逗号分割")
@TableField("chronic_disease_id")
private String chronicDiseaseId;
@@ -59,4 +68,13 @@
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "上次短信提醒时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("last_reminder_time")
+ private LocalDateTime lastReminderTime;
+
+ @ApiModelProperty(value = "诊所id")
+ @TableField("clinic_id")
+ private String clinicId;
+
}
--
Gitblit v1.7.1