From ccbfaf4700422eda488f5807ee9a0f3ce3a94b2c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 四月 2025 17:26:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/ServeRecord.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/ServeRecord.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/ServeRecord.java
index bdaaf48..67920e0 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/ServeRecord.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/ServeRecord.java
@@ -24,12 +24,12 @@
@ApiModel(value = "ServeRecord对象", description = "师傅服务记录")
public class ServeRecord extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("订单id")
@TableField("order_id")
- private Integer orderId;
+ private String orderId;
@ApiModelProperty("现场照片(多张照片 ','隔开)")
@TableField("photo")
--
Gitblit v1.7.1