# Conflicts: # src/main/java/com/bsth/server_rs/electric/ElectricService.java
2.CompanyServiceSoap.java安全bug修复