From 37d2350961bc16543d28e2c9c158dfb2c3734d73 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:05:32 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java
index 358f366..3993406 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
 import java.math.BigDecimal;
 
 /**
@@ -28,13 +29,13 @@
 	@NotNull
 	private String QRCode;
 	/**
-	 * 支付方式（1=微信，2=支付宝）
-	 */
-	@NotNull
-	private Integer paymentType;
-	/**
 	 * 充电余额
 	 */
 	@NotNull
-	private BigDecimal paymentAmount;
+	private BigDecimal chargingAmt;
+	/**
+	 * 充电车牌号
+	 */
+	@Null
+	private String PlateNum;
 }

--
Gitblit v1.7.1