From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingLot.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingLot.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingLot.java
index 15ecaff..288c211 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingLot.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingLot.java
@@ -33,6 +33,10 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+
+ @ApiModelProperty(value = "类型（1=自营，2=合作）")
+ @TableField("type")
+ private Integer type;
@ApiModelProperty(value = "车场名称")
@TableField("name")
@@ -41,6 +45,14 @@
@ApiModelProperty(value = "第三方停车场编号")
@TableField("code")
private String code;
+
+ @ApiModelProperty(value = "停车场标识")
+ @TableField("app_Key")
+ private String appKey;
+
+ @ApiModelProperty(value = "停车场秘钥")
+ @TableField("secret_Key")
+ private String secretKey;
@ApiModelProperty(value = "站点id")
@TableField("site_id")
--
Gitblit v1.7.1