From b70a45d79dbbc50b7c75254620c174fb8a6d2cd6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 20:23:02 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index 3e5d867..39343ad 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -37,13 +37,14 @@
@TableField("app_user_id")
private Long appUserId;
+ @ApiModelProperty(value = "停车场名称")
+ @TableField("name")
+ private String name;
+
@ApiModelProperty(value = "车牌号")
@TableField("license_plate")
private String licensePlate;
-
- @TableField(exist = false)
- private String name;
-
+
@TableField(exist = false)
private String uid;
@@ -122,5 +123,7 @@
@TableField("serialnumber")
private String serialnumber;
+ @TableField(exist = false)
+ private String parkName;
}
--
Gitblit v1.7.1