From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/entity/SysField.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/entity/SysField.java b/src/main/java/com/highdatas/mdm/entity/SysField.java
index 2488a2b..faca6fe 100644
--- a/src/main/java/com/highdatas/mdm/entity/SysField.java
+++ b/src/main/java/com/highdatas/mdm/entity/SysField.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.highdatas.mdm.pojo.Operate;
+import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.Date;
@@ -21,9 +22,13 @@
public class SysField extends Model<SysField> {
private static final long serialVersionUID = 1L;
-
+ /*
+ *涓婚敭
+ * */
private String id;
-
+ /*
+ *缂栫爜
+ * */
private String code;
/**
@@ -61,6 +66,46 @@
private transient Boolean refused;
private transient String menuName;
private transient String menuId;
+
+ private transient Object number;
+ private transient AntianaphylaxisType desensitizationType;
+ private transient Object initialPosition;
+ private transient BlurryType initialDirection;
+
+
+
+
+ public AntianaphylaxisType getDesensitizationType() {
+ return desensitizationType;
+ }
+
+ public void setDesensitizationType(AntianaphylaxisType desensitizationType) {
+ this.desensitizationType = desensitizationType;
+ }
+
+ public Object getNumber() {
+ return number;
+ }
+
+ public void setNumber(Object number) {
+ this.number = number;
+ }
+
+ public Object getInitialPosition() {
+ return initialPosition;
+ }
+
+ public void setInitialPosition(Object initialPosition) {
+ this.initialPosition = initialPosition;
+ }
+
+ public BlurryType getInitialDirection() {
+ return initialDirection;
+ }
+
+ public void setInitialDirection(BlurryType initialDirection) {
+ this.initialDirection = initialDirection;
+ }
public String getMenuName() {
return menuName;
@@ -260,6 +305,55 @@
}
@Override
+ public int hashCode() {
+ int hash = 0;
+ if (!StringUtils.isEmpty(tableName)) {
+ hash += tableName.hashCode();
+ }
+ if (!StringUtils.isEmpty(alias)) {
+ hash += alias.hashCode();
+ }
+ if (visible == null) {
+ hash += visible.hashCode();
+ }
+ if (orderNo == null) {
+ hash += orderNo.hashCode();
+ }
+ if (!StringUtils.isEmpty(code)) {
+ hash += code.hashCode();
+ }if (!StringUtils.isEmpty(align)) {
+ hash += align.hashCode();
+ }if (!StringUtils.isEmpty(format)) {
+ hash += format.hashCode();
+ }
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+// if (obj instanceof SysField) {
+// SysField compare = (SysField) obj;
+// return compare.getTableName().equalsIgnoreCase(tableName)
+// &&
+// compare.getAlias().equalsIgnoreCase(alias)
+// &&
+// compare.getVisible().equals(visible)
+// &&
+// compare.getOrderNo().equals(orderNo)
+// &&
+// compare.getCode().equalsIgnoreCase(code)
+// &&
+// compare.getAlign().equalsIgnoreCase(align)
+// &&
+// compare.getFormat().equalsIgnoreCase(format);
+// } else {
+//
+// }
+
+ }
+
+ @Override
public String toString() {
return "SysField{" +
"id=" + id +
--
Gitblit v1.8.0