Conflicts: src/main/java/com/baosight/hpjx/controller/LogInformationController.java src/main/java/com/baosight/hpjx/hp/sb/domain/HPSB001.java src/main/java/com/baosight/hpjx/hp/sb/domain/HPSB002.java src/main/java/com/baosight/hpjx/hp/tc/service/ServiceHPTCP001.java
