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

nnnjjj123

2021-01-11 b6ebb7d8e25fa5505494204abbc54da849ca548e

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

@@ -47,7 +47,7 @@
   }

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