Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 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;


}