From f6125b320b78b36c439e85d926cb2b11cd71fc6c Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 31 八月 2024 17:45:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
index e59bab3..e1d69a9 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
@@ -36,29 +36,37 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "设备编号")
+ @ApiModelProperty(value = "设备编号", required = true)
@TableField("code")
private String code;
- @ApiModelProperty(value = "充电设备名称")
+ @ApiModelProperty(value = "充电设备名称", required = true)
@TableField("name")
private String name;
- @ApiModelProperty(value = "桩号")
+ @ApiModelProperty(value = "桩号", required = true)
@TableField("number")
private Integer number;
- @ApiModelProperty(value = "设备类型（0=其他，1=直流设备，2=交流设备，3=交直流一体设备，4=无线设备）")
+ @ApiModelProperty(value = "设备类型（0=其他，1=直流设备，2=交流设备，3=交直流一体设备，4=无线设备）", required = true)
@TableField("type")
private Integer type;
- @ApiModelProperty(value = "站点id")
+ @ApiModelProperty(value = "站点id", required = true)
@TableField("site_id")
private Integer siteId;
+
+ @ApiModelProperty(value = "站点名称")
+ @TableField(exist = false)
+ private String siteName;
- @ApiModelProperty(value = "合作商id")
+ @ApiModelProperty(value = "合作商id", required = true)
@TableField("partner_id")
private Integer partnerId;
+
+ @ApiModelProperty(value = "合作商名称")
+ @TableField(exist = false)
+ private String partnerName;
@ApiModelProperty(value = "生产商机构代码")
@TableField("manufacturer_code")
@@ -77,7 +85,7 @@
@TableField("production_date")
private LocalDate productionDate;
- @ApiModelProperty(value = "额定功率")
+ @ApiModelProperty(value = "额定功率", required = true)
@TableField("rated_power")
private BigDecimal ratedPower;
@@ -88,6 +96,4 @@
@ApiModelProperty(value = "设备状态（1=工作中，2=离线，3=故障）")
@TableField("status")
private Integer status;
-
-
}
--
Gitblit v1.7.1