# Conflicts: # src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java # src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java