Merge remote-tracking branch 'origin/master'

doum

23 小时以前 d0da0ce546110de49cca9e0358029a51c53188d6

 server/dmmall_service/src/main/java/com/doumee/service/business/NoticeService.java

@@ -119,7 +119,7 @@
    void saveMemberIntegralNotice(Constants.IntegralObjType integralObjType, Integer type,
                                  Integer memberId,
                                  BigDecimal integral,
                                  Integer objId, String param1);
                                  Integer objId, String info);


    /**