From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TechnicianSubscribe.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 e037621..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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "主键")
@TableId("id")
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
@@ -55,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;
@@ -68,16 +68,13 @@
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
-
-
- @ApiModelProperty(value = "订单id")
- private Long orderId;
-
@TableField(exist = false)
private String idStr;
+ @TableField(exist = false)
+ private Long orderId;
- public void setId(Integer id) {
+ public void setId(Long id) {
this.id = id;
this.idStr = String.valueOf(id);
}
--
Gitblit v1.7.1