From 11ec7ac8f4832c4274cf61a19cc35cda3de9e0e5 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 七月 2025 16:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/model/entity/Type.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/linghu/model/entity/Type.java b/src/main/java/com/linghu/model/entity/Type.java
index 0901080..97bb0fe 100644
--- a/src/main/java/com/linghu/model/entity/Type.java
+++ b/src/main/java/com/linghu/model/entity/Type.java
@@ -25,10 +25,6 @@
*/
private String type_name;
- /**
- * 0-未删除 1-删除
- */
- private Integer del_flag;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@@ -46,8 +42,7 @@
}
Type other = (Type) that;
return (this.getType_id() == null ? other.getType_id() == null : this.getType_id().equals(other.getType_id()))
- && (this.getType_name() == null ? other.getType_name() == null : this.getType_name().equals(other.getType_name()))
- && (this.getDel_flag() == null ? other.getDel_flag() == null : this.getDel_flag().equals(other.getDel_flag()));
+ && (this.getType_name() == null ? other.getType_name() == null : this.getType_name().equals(other.getType_name()));
}
@Override
@@ -56,7 +51,6 @@
int result = 1;
result = prime * result + ((getType_id() == null) ? 0 : getType_id().hashCode());
result = prime * result + ((getType_name() == null) ? 0 : getType_name().hashCode());
- result = prime * result + ((getDel_flag() == null) ? 0 : getDel_flag().hashCode());
return result;
}
@@ -68,7 +62,6 @@
sb.append("Hash = ").append(hashCode());
sb.append(", type_id=").append(type_id);
sb.append(", type_name=").append(type_name);
- sb.append(", del_flag=").append(del_flag);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
--
Gitblit v1.7.1