From 37235c82903aaf4e7efe3096174f4a4f6430caef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 09:41:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
index 6d91ea3..a750a50 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -38,10 +40,11 @@
@ApiModelProperty(value = "技师id")
@TableField("technician_id")
- private Long technicianId;
+ private Integer technicianId;
@ApiModelProperty(value = "预约时间")
@TableField("subscribe_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime subscribeTime;
@ApiModelProperty(value = "服务方式（1=上门服务，2=到店服务）")
@@ -52,7 +55,7 @@
@TableField("user_address")
private String userAddress;
- @ApiModelProperty(value = "状态（0=待服务，1=已服务，2=已取消）")
+ @ApiModelProperty(value = "状态（0=待服务，1=已服务，2=已取消, 3=已到期）")
@TableField("status")
private Integer status;
@@ -63,7 +66,16 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
+ @TableField(exist = false)
+ private String idStr;
+ @TableField(exist = false)
+ private Long orderId;
+ public void setId(Long id) {
+ this.id = id;
+ this.idStr = String.valueOf(id);
+ }
}
--
Gitblit v1.7.1