From 0aa1c9d1a42e2ac5639228d23dfedbc03ded6fb5 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 30 三月 2022 16:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
index 02844b4..08ee5e9 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
@@ -10,7 +10,13 @@
@NoArgsConstructor
public class ItemsDTO {
private String id;
- private Date startDay;
- private Date endDay;
- private List<ProjectPlan> nodes;
+ private String startDay;
+ private String endDay;
+ private List<FlowsDTO> nodes;
+ private Double presaleAmt;
+ private Double plandeAmt;
+ private Double realdeAmt;
+ private Double planinAmt;
+ private Double realinAmt;
+ private String type;
}
--
Gitblit v1.9.1