From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java
index 524bde1..c0d1982 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java
@@ -42,6 +42,8 @@
     private String endTime;
     /**涓撳尯鏍囪瘑*/
     private List<String> zoneList;
+    /**鐢ㄦ埛phis鏍囪瘑*/
+    private List<String> userHisIdList;
 
     /* 瀵煎嚭璁㈠崟绫诲瀷 1鏍囧噯璁㈠崟 */
     public final static Integer ORDER_STAN = 1;

--
Gitblit v1.8.0