潘钊 / control_service_data_Interface · Commits

# Conflicts:
#	src/main/java/com/bsth/server_rs/electric/ElectricService.java

…data_Interface into lingang

2.CompanyServiceSoap.java安全bug修复

# Conflicts:
#	src/main/java/com/bsth/CXFConfig.java