Administrator 4 роки тому
батько
коміт
5e6304ad77

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -41,7 +41,7 @@ public class BaseEntity implements Serializable
     /**
      * 是否删除(0未删除、1已删除)
      */
-    private Long isDel;
+    private String isDel;
 
     /**
      * 部门id
@@ -137,14 +137,14 @@ public class BaseEntity implements Serializable
         this.params = params;
     }
 
-    public Long getIsDel() {
+    public String getIsDel() {
         if (isDel == null){
-            isDel = 0L;
+            isDel = "0";
         }
         return isDel;
     }
 
-    public void setIsDel(Long isDel) {
+    public void setIsDel(String isDel) {
         this.isDel = isDel;
     }
 

+ 1 - 12
ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectReport.java

@@ -50,10 +50,6 @@ public class BmProjectReport extends BaseEntity
     @Excel(name = "项目id*")
     private Long bmProjectId;
 
-    /** 是否删除 */
-    @Excel(name = "是否删除")
-    private Long isDel;
-
     public void setId(Long id) 
     {
         this.id = id;
@@ -135,15 +131,8 @@ public class BmProjectReport extends BaseEntity
     {
         return bmProjectId;
     }
-    public void setIsDel(Long isDel) 
-    {
-        this.isDel = isDel;
-    }
 
-    public Long getIsDel() 
-    {
-        return isDel;
-    }
+
 
     @Override
     public String toString() {