From b1834429716953b4d15b1f98e791c453e7f6d6dc Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 28 12월 2021 11:38:14 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js index d6ea913..d39030e 100644 --- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js +++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js @@ -86,7 +86,7 @@ //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "", locale: { - format: 'YYYY-MM-DD/hh-mm-ss A', + format: 'YYYY-MM-DD/hh:mm:ss A', applyLabel: options.applyLabel, cancelLabel: options.cancelLabel, daysOfWeek: options.daysOfWeek, -- Gitblit v1.8.0