市政工程新增名称字段和工程分类

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringIndustry.java

@@ -77,13 +77,11 @@ public class ZEngineeringIndustry extends BaseEntity {
     /**
      * 工程名称
      */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginName;
 
     /**
      * 工程分类
      */
-    @NotBlank(message = "工程分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginClassification;
     /**
      * 乐观锁

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringIndustryVo.java

@@ -3,9 +3,12 @@ package com.ruoyi.zdsz.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 
@@ -93,6 +96,18 @@ public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "类型(工业工程|市政工程)")
     private String type;
 
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程分类
+     */
+    @ExcelProperty(value = "工程分类")
+    private String enginClassification;
+
 
     private List<ZEngineeringNodeBo> zEngineeringNodeBo;
 }