From be186f360aa619e94988bdaf83486bc69bcaf72c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 11:33:16 +0800
Subject: [PATCH] 充电桩

---
 dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
index dea9283..8fd1e27 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mOrder.java
@@ -29,14 +29,29 @@
     private Long poleId;
 
     /**
+     * 瀵瑰簲鐨勭伅鏉嗚澶噈ac
+     */
+    private String poleMac;
+
+    /**
+     * 鐏潌鍚嶇О
+     */
+    private String poleName;
+
+    /**
      * 鍏呯數妗㎝AC
      */
     private String c3Mac;
 
     /**
-     * 瀵瑰簲鐨勭伅鏉嗚澶噈ac
+     * 鍏呯數妗╁悕绉�
      */
-    private String poleMac;
+    private String c3Name;
+
+    /**
+     * udid
+     */
+    private String c3Udid;
 
     /**
      * 璁㈠崟鍟嗘埛鍙�
@@ -54,9 +69,9 @@
     private Double totalAmount;
 
     /**
-     * 瀹炴敹閲戦
+     * 鍓╀綑閲戦
      */
-    private Double receiptAmount;
+    private Double surplusAmount;
 
     /**
      * 閫�娆�
@@ -74,9 +89,14 @@
     private Integer subscribeChargingCapacity;
 
     /**
-     * 瀹炲厖鐢甸噺
+     * 瀹炲厖鐢甸噺  鍓嶇鏄剧ず
      */
     private Double actualChargingCapacity;
+
+    /**
+     * 瀹炲厖鐢甸噺  鍚庣璁$畻鐢�
+     */
+    private Double actualChargingCapacityHide;
 
     /**
      * 璁㈠崟鍒涘缓鏃堕棿鎴�
@@ -114,25 +134,9 @@
     private Integer orderStatus;
 
     /**
-     * 鍏呯數妗╁悕绉�
-     */
-    private String c3Name;
-
-    /**
-     * 鐏潌鍚嶇О
-     */
-    private String poleName;
-
-    /**
      * 0 鍏呯數涓�   1鍏呯數缁撴潫
      */
-    private Integer changingStates;
-
-
-    /**
-     * udid
-     */
-    private String c3Udid;
+    private Integer chargingStates;
 
     /**
      * 鐢ㄦ埛鏍囪瘑

--
Gitblit v1.9.3