Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java

@@ -9,7 +9,6 @@ import com.ningdatech.pmapi.organization.model.vo.OrganizationSynthesizeTreeVO;
 import com.ningdatech.pmapi.organization.model.vo.OrganizationTreeVO;
 import com.ningdatech.pmapi.organization.model.vo.ResOrganizationListVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +37,7 @@ public class DingOrganizationController {
 
     private final OrganizationManage organizationManage;
 
-    @ApiModelProperty("单位列表筛选")
+    @ApiOperation("单位列表筛选")
     @PostMapping("/list")
     public PageVo<ResOrganizationListVO> organizationList(@Valid @RequestBody ReqOrganizationListPO reqOrganizationListPO) {
         return organizationManage.organizationList(reqOrganizationListPO);
@@ -50,7 +49,7 @@ public class DingOrganizationController {
         return organizationManage.getChildOrganizationList(parentCode);
     }
 
-    @ApiModelProperty("综合列表筛选")
+    @ApiOperation("综合列表筛选")
     @PostMapping("/synthesize-list")
     public List<OrganizationSynthesizeTreeVO> organizationSynthesizeList(@Valid @RequestBody ReqSynthesizePO request) {
         return organizationManage.organizationSynthesizeList(request);

pmapi/src/main/java/com/ningdatech/pmapi/organization/model/po/ReqSynthesizePO.java

@@ -15,7 +15,6 @@ import javax.validation.constraints.NotBlank;
 @ApiModel("单位列表综合筛选请求")
 public class ReqSynthesizePO {
 
-    @NotBlank(message = "父组织code不能为空")
     @ApiModelProperty("父组织code")
     private String parentCode;