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

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java

@@ -42,7 +42,17 @@
public class CatalogServiceImpl extends ServiceImpl<catalogMapper, catalog> implements catalogService {

   @Override
   public List<catalogVO> selectCatalogList() {
   public List<Map<String, Object>> selectCatalogList() {
      return baseMapper.selectCatalogList();
   }

   @Override
   public List selectCatalogEqNUmber(String pid) {
      return baseMapper.selectCatalogEqNUmber(pid);
   }

   @Override
   public List<Map<String, Object>> selectCount() {
      return baseMapper.selectCount();
   }
}