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

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.java

@@ -36,5 +36,5 @@
   List<Map<String, Object>> selectCatalogList();
   List<Map<String, Object>> selectCount();

   String selectCatalogEqNUmber(String pid);
   List selectCatalogEqNUmber(String pid);
}