Merge remote-tracking branch 'origin/master'

zengh

2022-02-22 b4a26dbdfbb5d8c12ae1e0fc14f998aebbf05af4

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

@@ -34,7 +34,8 @@
public interface EnergyMapper extends BaseMapper<Energy> {
   List<String> selectTreeNum(String time);
   List<String> selectEnergyTree(String identification);
   void  updateEnergyId(String id);
   void  updateEnergyId(String id,String identification);
   void  updateEnergyIds(Integer id,String identification);
   void  updateEnergyType(String code,String time);
   String selectType(String time);
}