From f6c4a8f1308c3d43605a7c8fc8cfc705439ad62f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:46:27 +0800
Subject: [PATCH] ##

---
 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java |    2 +-
 src/main/java/zy/cloud/wms/manager/entity/Item.java                      |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index d2a536c..90ffd3d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -301,7 +301,7 @@
         for (Item item : itemsArray) {
             ItemDTO itemDto = new ItemDTO();
             itemDto.setProjectName(item.getName());
-            itemDto.setProjectType(item.getType());
+            itemDto.setProjectType(item.getType$());
             itemDto.setProjectStartTime(item.getStartTime$());
             itemDto.setProjectEndTime(item.getEndTime$());
             List<ProjectPlan> projectPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 38a2ed1..46291cd 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -149,6 +149,7 @@
     private String type;
 
 
+
     @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date realStartTime;

--
Gitblit v1.9.1