From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/catalog/entitly/catalog.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/catalog/entitly/catalog.java b/src/main/java/org/springblade/modules/catalog/entitly/catalog.java
index 78130cd..336ad3d 100644
--- a/src/main/java/org/springblade/modules/catalog/entitly/catalog.java
+++ b/src/main/java/org/springblade/modules/catalog/entitly/catalog.java
@@ -39,8 +39,8 @@
private Integer id;
@TableField("name")
private String name;
- @TableField("pid")
- private Integer pid;
+ @TableField("pId")
+ private Integer pId;
@TableField("eqid")
private String eqid;
--
Gitblit v1.9.3