develop # Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java # mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java # mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java # mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java # mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java # mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java # mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java # mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java # mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml # mallinkService/src/main/resources/mapper/WxRentContractMapper.xml