Merge remote-tracking branch 'origin/master'

doum

14 小时以前 0d0e67818a45161af14114211f43aafd232a6da2

Merge remote-tracking branch 'origin/master'

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

@@ -288,7 +288,10 @@
                                         Integer objId,String param1){
        String title = integralObjType.getName();
        String info = integralObjType.getNoteinfo();
        info = info.replace("${param}",integral.toString()).replace("${param1}",param1);
        info = info.replace("${param}",integral.toString());
        if(StringUtils.isNotBlank(param1)){
            info = info .replace("${param1}",param1);
        }
        this.saveNoticeInfo(
                type,
                Constants.ONE,