Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 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;