# Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java # mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java # mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java # mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml # mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml