From 6912e074af61b73307d2fc31b1b8f4974f5eb4f3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 22 五月 2026 10:17:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
index 523c6b6..431930f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
@@ -31,6 +31,10 @@
     private String endTime;
     @ApiModelProperty(value = "订单来源 1明星 2快电 3新电途")
     private Integer orderSource;
+    @ApiModelProperty(value = "是否白名单用户:0=否,1=是")
+    private Integer isWhitelist;
+    @ApiModelProperty(value = "支付方式筛选 1微信支付 2支付宝支付 3余额支付")
+    private Integer paymentType;
     @ApiModelProperty(value = "用户ids 前端忽略")
     private List<Long> userIds;
     @ApiModelProperty(value = "站点ids 前端忽略")

--
Gitblit v1.7.1