Merge branch 'inspection'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -87,10 +87,17 @@ public class InspectionItemPlan {
     @ApiModelProperty(value = "处理方式")
     private String memo;
 
+
+    /**
+     * 巡查结果是否异常 0-正常 1-异常
+     */
+    @ApiModelProperty(value = "巡查结果是否异常 0-正常 1-异常")
+    private Integer conclusionStatus;
+
     /**
      * 0 -未提交 1-正常 2-异常
      */
-    @ApiModelProperty(value = "0 -未提交 1-正常 2-异常")
+    @ApiModelProperty(value = "提交状态 0 -未提交 1-正常 2-异常")
     private Integer status;
 
     /**
@@ -276,4 +283,12 @@ public class InspectionItemPlan {
     public void setOrganName(String organName) {
         this.organName = organName;
     }
+
+    public Integer getConclusionStatus() {
+        return conclusionStatus;
+    }
+
+    public void setConclusionStatus(Integer conclusionStatus) {
+        this.conclusionStatus = conclusionStatus;
+    }
 }