fix InterlockBase InterlockSummaryVO

jeecg-module-interlock/src/main/java/org/jeecg/modules/base/entity/InterlockBase.java

@@ -114,11 +114,11 @@ public class InterlockBase implements Serializable {
     private java.lang.String instrumentStatusNormal;
     private java.lang.String instrumentStatusNormalName;
     private java.lang.String instrumentStatusAbnormalName;
-    /**联锁状态-正常*/
-    @Excel(name = "联锁状态-正常", width = 15)
-    @ApiModelProperty(value = "联锁状态-正常")
-    private java.lang.String interlockStatusNormal;
-    private java.lang.String interlockStatusNormalName;
-    private java.lang.String interlockStatusAbnormalName;
+    /**联锁状态-投用*/
+    @Excel(name = "联锁状态-投用", width = 15)
+    @ApiModelProperty(value = "联锁状态-投用")
+    private java.lang.String interlockStatusTy;
+    private java.lang.String interlockStatusTyName;
+    private java.lang.String interlockStatusWtyName;
 
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/vo/InterlockSummaryVO.java

@@ -41,26 +41,30 @@ public class InterlockSummaryVO {
     /**仪表状态*/
     @Excel(name = "仪表状态", width = 15)
     @ApiModelProperty(value = "仪表状态")
-    @Dict(dicCode = "instrument_status")
+//    @Dict(dicCode = "instrument_status")
     private java.lang.String instrumentStatus;
+    private java.lang.String instrumentStatus_dictText;
     /**控制系统状态*/
     @Excel(name = "控制系统状态", width = 15)
     @ApiModelProperty(value = "控制系统状态")
-    @Dict(dicCode = "control_system_status")
+//    @Dict(dicCode = "control_system_status")
     private java.lang.String controlSystemStatus;
+    private java.lang.String controlSystemStatus_dictText;
     /**联锁状态*/
     @Excel(name = "联锁状态", width = 15)
     @ApiModelProperty(value = "联锁状态")
-    @Dict(dicCode = "interlock_status")
+//    @Dict(dicCode = "interlock_status")
     private java.lang.String interlockStatus;
+    private java.lang.String interlockStatus_dictText;
     /**回路健康级别*/
     @Excel(name = "回路健康级别", width = 15)
     @ApiModelProperty(value = "回路健康级别")
     private java.lang.String loopHealthLevel;
     /**旁路状态*/
-    @Dict(dicCode = "bypass")
+//    @Dict(dicCode = "bypass")
     @ApiModelProperty(value = "旁路状态")
     private java.lang.String bypass;
+    private java.lang.String bypass_dictText;
 
 
     /**装置id*/