From 43e6f0b8b1c8b15e28364cf8faaa734c7ed715ae Mon Sep 17 00:00:00 2001
From: liuxinxin <anjszy@163.com>
Date: Thu, 23 Feb 2023 17:56:55 +0800
Subject: [PATCH] =?UTF-8?q?fix=E5=8D=B0=E7=AB=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java    | 1 -
 .../pmapi/fiscal/controller/CompanyFiscalCodeController.java      | 4 ++--
 .../pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java    | 8 ++++++--
 .../ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java
index ec0ca9f..5e000b0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java
@@ -7,7 +7,6 @@ import com.ningdatech.pmapi.meta.helper.TagCache;
 import com.ningdatech.pmapi.meta.model.ExpertRegionInfo;
 import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
 import com.ningdatech.pmapi.meta.model.dto.TagDTO;
-import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java
index fd71650..d4daccc 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java
@@ -5,10 +5,10 @@ import com.ningdatech.pmapi.fiscal.manage.CompanyFiscalCodeManage;
 import com.ningdatech.pmapi.fiscal.model.po.ReqCompanyFiscalCodeAndSealSnPO;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 
@@ -20,7 +20,7 @@ import javax.validation.Valid;
  * @author Lierbao
  * @since 2023-02-10
  */
-@Controller
+@RestController
 @RequestMapping("/api/v1/fiscal-code")
 @RequiredArgsConstructor
 @ApiOperation("印章配置/财政编码配置")
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java
index d28a3f1..401e3ee 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java
@@ -14,11 +14,15 @@ import javax.validation.constraints.NotBlank;
 @ApiModel("财政编码配置")
 public class ReqCompanyFiscalCodeAndSealSnPO {
 
-    @NotBlank
+    @NotBlank(message = "组织编码 不能为空")
+    @ApiModelProperty("组织编码")
+    private String organizationCode;
+
+    @NotBlank(message = "财政编码 不能为空")
     @ApiModelProperty("财政编码")
     private String fiscalCode;
 
-    @NotBlank
+    @NotBlank(message = "印章编号 不能为空")
     @ApiModelProperty("印章编号")
     private String sealSn;
 
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
index 7712ef6..cf7abb8 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
@@ -286,7 +286,7 @@ public class ProjectDraftVO implements Serializable {
     private List<ProjectApplication> applicationList;
 
     @ApiModelProperty("新增form内容")
-    private Map<String,Object> dynamicForm;
+    private Map<String, Object> dynamicForm;
 
     @ApiModelProperty("用户id")
     private String userId;