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

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

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

@@ -33,5 +33,8 @@
 * @since 2020-07-06
 */
public interface catalogMapper extends BaseMapper<catalog> {
   List<catalogVO> selectCatalogList();
   List<Map<String, Object>> selectCatalogList();
   List<Map<String, Object>> selectCount();

   List selectCatalogEqNUmber(String pid);
}