From b81701324e8db60da4ad46d5f7950dddca702cc7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 11 十二月 2023 17:15:26 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
crm-platform-feign/src/main/java/com/hz/crm/dto/FOrderPageDto.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 e61869a..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
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.List;
+
@Data
public class FOrderPageDto extends PageDto {
/**璁㈠崟鐘舵��*/
@@ -38,7 +40,10 @@
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
-
+ /**涓撳尯鏍囪瘑*/
+ private List<String> zoneList;
+ /**鐢ㄦ埛phis鏍囪瘑*/
+ private List<String> userHisIdList;
/* 瀵煎嚭璁㈠崟绫诲瀷 1鏍囧噯璁㈠崟 */
public final static Integer ORDER_STAN = 1;
--
Gitblit v1.8.0