Merge remote-tracking branch 'origin/master'

Administrator

2021-03-02 a644c4bb75b173d14fad9ed7dc7cf85c41d4953a

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

@@ -37,4 +37,5 @@
   List<Map<String, Object>> selectEq();
   List<Map<String, Object>> selectWar(String beginTime,String endTime);
   List<catalogVO> lazyTree(String tenantId, Long parentId);
   void updateCatalog(String name, String eqid);
}