Conflicts: src/main/java/com/baosight/hggp/hg/constant/HGSqlConstant.java src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java
