Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager

nnnjjj123

2021-01-11 b6ebb7d8e25fa5505494204abbc54da849ca548e

 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;