develop # Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java # mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java # mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java # mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java # mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java # mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml # mallinkService/src/main/resources/mapper/WxCouponMapper.xml