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

zengh

2021-01-28 d80ca95c3c0cf4b1a14f335feb13cdf30820839c

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

@@ -34,5 +34,5 @@
   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);
}