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

nnnjjj123

2021-01-11 b6ebb7d8e25fa5505494204abbc54da849ca548e

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

@@ -39,5 +39,5 @@
   List<Map<String, Object>> selectEq();
   List<Map<String, Object>> selectWar();

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