# Conflicts: # mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java # mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java