From 10de85f85ad0874b2d93c851bb4d3eacab24a183 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 21 八月 2024 14:45:25 +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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 289f788..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
@@ -58,7 +58,7 @@
     
     @ApiModelProperty(value = "站点名称")
     @TableField(exist = false)
-    private Integer siteName;
+    private String siteName;
 
     @ApiModelProperty(value = "合作商id", required = true)
     @TableField("partner_id")
@@ -66,7 +66,7 @@
     
     @ApiModelProperty(value = "合作商名称")
     @TableField(exist = false)
-    private Integer partnerName;
+    private String partnerName;
 
     @ApiModelProperty(value = "生产商机构代码")
     @TableField("manufacturer_code")

--
Gitblit v1.7.1