From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java
index 373ec0a..48aed0f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/entitly/catalog.java
@@ -36,13 +36,14 @@
private static final long serialVersionUID = 1L;
- private Integer id;
+ private Long id;
@TableField("name")
private String name;
@TableField("pId")
- private Integer pId;
+ private Long pId;
@TableField("eqid")
private String eqid;
+ private String tenant_id;
}
--
Gitblit v1.9.3