Merge remote-tracking branch 'origin/dev' into dev

src/views/financialManagement/compareBill/configuration/detailsPage.json

@@ -91,12 +91,18 @@
     {
       "label": "日期起",
       "prop": "rentStartDate",
+      "type": "datetime",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "index": 8,
       "width": 180
     },
     {
       "label": "日期止",
       "prop": "rentEndDate",
+      "type": "datetime",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "index": 9,
       "width": 180
     },