Merge remote-tracking branch 'origin/zypms' into zypms

mrzhssss

2022-09-06 5c39f26d19269ddcb8d442aeeecfee5a9665bb59

 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>()
@@ -323,7 +323,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>()