Merge remote-tracking branch 'origin/master'

zengh

2022-03-03 bc493033ebc2ab2bea86626f3cc66727cb993b7e

 src/main/java/org/springblade/modules/energy/mapper/EnergyMapper.java

@@ -35,6 +35,7 @@
   List<String> selectTreeNum(String time);
   List<String> selectEnergyTree(String identification);
   void  updateEnergyId(String id,String identification);
   void  updateEnergyIds(Integer id,String identification);
   void  updateEnergyType(String code,String time);
   String selectType(String time);
}