From 961b14176f87a6771d4463662223ae201091b07b Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Wed, 22 Sep 2021 17:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9C=BA=E7=AB=99=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BD=BF=E5=85=B6?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E5=BE=80=E6=95=B0=E6=8D=AE=E5=BA=93xhpc=5Fch?=
 =?UTF-8?q?arging=5Fstation=E8=A1=A8=E4=B8=AD=E7=9A=84operator=5Fid=5Fevcs?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcChargingStationMapper.xml          | 10 ++++++++--
 .../xhpc/common/domain/XhpcChargingStation.java   | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
index acb750ab..6ab9e7d1 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
@@ -506,7 +506,10 @@
                 remark,
             </if>
             <if test="null != stationType">
-                station_type
+                station_type,
+            </if>
+            <if test="null != operatorIdEvcs and '' != operatorIdEvcs">
+                operator_id_evcs
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -586,7 +589,10 @@
                 #{remark},
             </if>
             <if test="null != stationType">
-                #{stationType}
+                #{stationType},
+            </if>
+            <if test="null != operatorIdEvcs and '' != operatorIdEvcs">
+                #{operatorIdEvcs}
             </if>
         </trim>
     </insert>
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
index 37f3adf1..6df37a5e 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
@@ -100,6 +100,21 @@ public class XhpcChargingStation extends BaseEntity {
     @Excel(name = "温馨提示说明")
     private String reminderInstructions;
 
+    /**
+     * 对接第三方平台及监管平台的operatorId
+     */
+    private String operatorIdEvcs;
+
+    public String getOperatorIdEvcs() {
+
+        return operatorIdEvcs;
+    }
+
+    public void setOperatorIdEvcs(String operatorIdEvcs) {
+
+        this.operatorIdEvcs = operatorIdEvcs;
+    }
+
     public void setChargingStationId(Long chargingStationId)
     {
         this.chargingStationId = chargingStationId;