Conflicts: src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT002.java src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
