From a87b1c93c01a117e7d86d926edfac285e0d56ca1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 6 Aug 2021 13:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BC=80=E5=A7=8B/=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E7=BB=91=E5=AE=9A=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/js/common.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index 2e29dcebf..d16d04592 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -52,6 +52,7 @@ $(function() {
                 elem: '#startTime',
                 max: $('#endTime').val(),
                 theme: 'molv',
+                type: $('#startTime').attr("data-type") || 'date',
                 trigger: 'click',
                 done: function(value, date) {
                     // 结束时间大于开始时间
@@ -70,6 +71,7 @@ $(function() {
                 elem: '#endTime',
                 min: $('#startTime').val(),
                 theme: 'molv',
+                type: $('#endTime').attr("data-type") || 'date',
                 trigger: 'click',
                 done: function(value, date) {
                     // 开始时间小于结束时间