From 18e68871f0423910f748a727ceab297a8e4765d1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 14:27:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java | 14 ++++++++++++--
1 files changed, 12 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 2da2886..e037621 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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "主键")
@TableId("id")
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "技师id")
@TableField("technician_id")
- private Long technicianId;
+ private Integer technicianId;
@ApiModelProperty(value = "预约时间")
@TableField("subscribe_time")
@@ -70,5 +70,15 @@
private LocalDateTime createTime;
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+ @TableField(exist = false)
+ private String idStr;
+
+
+ public void setId(Integer id) {
+ this.id = id;
+ this.idStr = String.valueOf(id);
+ }
}
--
Gitblit v1.7.1