Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-01-05 2d4cbcc4f92edbc4f926d9710bdda64520039c2b

 src/app/core/services/date.service.ts

@@ -6,6 +6,10 @@
export class DateService {

  date_format(date: string, format: string) {
    return moment(date).format('YYYY-MM-DD');
    return moment(date).format(format);
  }

  today(format: string) {
    return moment().format(format);
  }
}