Merge remote-tracking branch 'origin/master' into dev-20230128

governance/src/main/java/com/hungraim/ltc/governance/controller/NursingServiceItemsController.java

@@ -61,7 +61,8 @@ public class NursingServiceItemsController {
     @RequestMapping("/organProjectConfig")
     public Result<Object> organProjectConfig(ChSrvOrganProject project) {
         //参数校验
-        if (project.getSrvOrganId() == null || StrUtil.isBlank(project.getItemName()) || StrUtil.isBlank(project.getServiceContent()) || project.getCategoryType() == null || project.getItemPrice() == null) {
+        //project.getSrvOrganId() == null || || project.getItemPrice() == null
+        if (StrUtil.isBlank(project.getItemName()) || StrUtil.isBlank(project.getServiceContent()) || project.getCategoryType() == null ) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
         nursingServiceItemsService.organProjectConfig(project);