diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java index 29e6b8a..d370ed8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java @@ -1,10 +1,6 @@ package com.ningdatech.pmapi.meeting.controller; -import cn.hutool.core.io.FileUtil; -import cn.hutool.json.JSON; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; import com.ningdatech.basic.model.IdVo; import com.ningdatech.basic.model.PageVo; import com.ningdatech.log.annotation.WebLog; @@ -18,9 +14,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; /** *

@@ -154,14 +147,14 @@ public class MeetingController { @ApiOperation("设置专家组长") @PostMapping("setUpHeadman") @WebLog(value = "设置专家组长") - public void setUpHeadman(@RequestBody ExpertConfirmReq req){ + public void setUpHeadman(@RequestBody ExpertConfirmReq req) { meetingManage.setUpHeadman(req); } @ApiOperation("重发短信") @PostMapping("/confirmedRoster") @WebLog(value = "重发短信") - public void resendSms(MeetingCancelReq req){ + public void resendSms(MeetingCancelReq req) { meetingManage.confirmedRoster(req.getMeetingId()); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java index 2ce9a08..f1f9908 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java @@ -26,7 +26,7 @@ public class RegionConverter { public static RegionDTO toRegionDTO(Region region) { RegionDTO dto = new RegionDTO(); dto.setRegionLevel(region.getRegionLevel()); - dto.setRegionName(region.getName()); + dto.setRegionName(region.getRegionName()); dto.setParentCode(region.getParentCode()); dto.setRegionCode(region.getRegionCode()); dto.setId(region.getId()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java index dc97b52..2dc9afa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java @@ -27,7 +27,7 @@ public class Region implements Serializable { private String regionCode; - private String name; + private String regionName; private Integer regionLevel; @@ -37,10 +37,6 @@ public class Region implements Serializable { private Long parentId; - private LocalDateTime createOn; - - private LocalDateTime updateOn; - private String regionCodePath; private Boolean deleted;