Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

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

@@ -34,7 +34,7 @@
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  updateEnergyType(String code,String time);
   String selectType(String time);
}