From c302589567b7b556d8dfd7fca8cf3cf215d1a390 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 24 Feb 2021 20:31:43 +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