# Conflicts: # mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java # mallinkService/src/main/resources/mapper/WxBillAllMapper.xml