From b0cc9bd3619e69fa4c8bbdedebb56435cfd74a8f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 11:24:51 +0800
Subject: [PATCH] 12.18

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 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 e0574ab..b09a5d2 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
@@ -40,7 +40,7 @@
 
     @ApiModelProperty(value = "技师id")
     @TableField("technician_id")
-    private Long technicianId;
+    private Integer technicianId;
 
     @ApiModelProperty(value = "预约时间")
     @TableField("subscribe_time")
@@ -55,28 +55,26 @@
     @TableField("user_address")
     private String userAddress;
 
-    @ApiModelProperty(value = "状态(0=待服务,1=已服务,2=已取消)")
+    @ApiModelProperty(value = "状态(0=待服务,1=已服务,2=已取消, 3=已到期)")
     @TableField("status")
     private Integer status;
 
     @ApiModelProperty(value = "删除(0=否,1=是)")
     @TableField("del_flag")
-    @TableLogic
     private Integer delFlag;
 
     @ApiModelProperty(value = "添加时间")
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
-
-
-    @ApiModelProperty(value = "订单id")
-    @TableField(exist = false)
-    private Long orderId;
-
     @TableField(exist = false)
     private String idStr;
+    @TableField("order_id")
+    private Long orderId;
 
 
-
+    public void setId(Long id) {
+        this.id = id;
+        this.idStr = String.valueOf(id);
+    }
 }

--
Gitblit v1.7.1