# Conflicts: # src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG001.java # src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002.java # src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002B.java