Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public

tangzy

2021-11-03 7e93173fbe1cff78dc93bee3846d38624abdd092

 src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java

@@ -48,8 +48,8 @@
   }

   @Override
   public void updateEnergyId(String id) {
      baseMapper.updateEnergyId(id);
   public void updateEnergyId(String id,String identification) {
      baseMapper.updateEnergyId(id,identification);
   }

   @Override