Merge remote-tracking branch 'origin/master'

doum

10 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java

@@ -254,6 +254,6 @@
        dealIntegralRequest.setMemberId(memberId);
        dealIntegralRequest.setObjId(card.getId());
        dealIntegralRequest.setDealType(Constants.ZERO);
        integralService.dealIntegral(dealIntegralRequest);
        integralService.dealIntegral(dealIntegralRequest,null);
    }
}