From 709c9fb1f42a70da66ab9b759014b009b1c67d95 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 17 1월 2022 14:03:30 +0900
Subject: [PATCH] 충돌 병합
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 7e6e62a..1da24db 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -101,6 +101,7 @@
});
} else if ($attrs["rangeType"] === "multiDate") {
$($element).daterangepicker({
+ timePicker24Hour : true,
timePicker: true,
timePickerSeconds : true,
autoUpdateInput: true,
--
Gitblit v1.8.0