Merge branch 'dev' into dev-g

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java

@@ -0,0 +1,51 @@
+package com.jsowell.pile.vo.base;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ConfirmStartChargingMemberVO {
+    /**
+     * 会员ID
+     */
+    private String memberId;
+
+    /**
+     * 车牌号
+     */
+    private String plateNumber;
+
+    /**
+     * 本金金额
+     */
+    private BigDecimal principalBalance;
+
+    /**
+     * 赠送金额
+     */
+    private BigDecimal giftBalance;
+
+    /**
+     * 总账户余额
+     */
+    private BigDecimal totalBalance;
+
+    /**
+     * 平台测试员状态
+     * 1-是；0-否
+     */
+    private String platformTesterFlag;
+
+    /**
+     * 站点白名单状态
+     * 1-是；0-否
+     */
+    private String stationWhiteListFlag;
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderCountByTimeVO.java

@@ -0,0 +1,20 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.Data;
+
+@Data
+public class OrderCountByTimeVO {
+    /**
+     * 时间段
+     */
+    private String timeSlot;
+
+    /**
+     * 订单数量
+     */
+    private Integer orderCount;
+
+    private String startTime;
+    private String endTime;
+    private Integer count ;
+}