From 4dd69a0476fc2b9e1cff291611d7e56fbe4324ec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 05 十一月 2024 11:19:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderCountRequest.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderCountRequest.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderCountRequest.java
index 299e2c6..bb209e0 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderCountRequest.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderCountRequest.java
@@ -17,7 +17,7 @@
 public class OrderCountRequest {
 
     @ApiModelProperty("所选城市id集合")
-    private List<String> cityIdList;
+    private List<String> cityList;
 
     @ApiModelProperty("查询订单状态(全部订单:该字段不传值；其他状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派))")
     private Integer orderState;

--
Gitblit v1.7.1