Merge remote-tracking branch 'origin/master'

nnnjjj123

2021-01-29 047e1ec0b94317cc2a65657b4b101c5f769c3530

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/mapper/catalogMapper.java

@@ -33,7 +33,7 @@
   List<Map<String, Object>> selectCount();
   List<Map<String, Object>> selectAddvcd();
   List<Map<String, Object>> selectEq();
   List<Map<String, Object>> selectWar();
   List<Map<String, Object>> selectWar(String beginTime,String endTime);

   List selectCatalogEqNUmber(String pid);
}