From c1107fe385312f9a7b1d9d84c06aaf54e01440fa Mon Sep 17 00:00:00 2001 From: cmg <527198563@qq.com> Date: 星期二, 14 五月 2024 15:27:12 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-stander --- 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