# Conflicts: # src/main/java/com/huiju/estateagents/common/CommConstant.java # src/main/java/com/huiju/estateagents/controller/TaPolicyController.java # src/main/java/com/huiju/estateagents/entity/TaPolicy.java