# Conflicts: # gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/invw/InvwCardDetailsRepo.java # zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstCallBackManager.java