Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 server/dmmall_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -3005,7 +3005,7 @@
        Date date = new Date();
        Long l = date.getTime()+1000*60*60*24*days;
        date.setTime(l);
        return DateToStr(date, "yyyyMMdd");
        return DateToStr(date, "yyyy-MM-dd");
    }

    public static String beforeDateToStr(Integer days){