From 17ad50cedba13067c482a61b3aebc14f0700d5d0 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 6 Jul 2020 22:30:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E5=88=97=E9=AB=98=E5=BA=A6=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/columns/bootstrap-table-fixed-columns.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js index 6861d5ff7..4a22bd69f 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js @@ -216,7 +216,7 @@ this.$fixedBody.css({ width: this.$fixedHeader.width(), - height: height, + height: height - 12, top: top + 1 }).show(); From 7208cd6816244cc12e2ff709bb1cc0e42ef2daf0 Mon Sep 17 00:00:00 2001 From: Hacker <721806280@qq.com> Date: Tue, 7 Jul 2020 09:22:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20ruoyi-common/src/main/java/com/ruo?= =?UTF-8?q?yi/common/utils/poi/ExcelUtil.java.=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=B7=B2=E8=BF=87=E6=97=B6=E7=9A=84=E6=96=B9=E6=B3=95=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/utils/poi/ExcelUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 688d15188..32a26e94c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -905,10 +905,10 @@ public class ExcelUtil Cell cell = row.getCell(column); if (StringUtils.isNotNull(cell)) { - if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA) + if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) { val = cell.getNumericCellValue(); - if (HSSFDateUtil.isCellDateFormatted(cell)) + if (DateUtil.isCellDateFormatted(cell)) { val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换 } @@ -924,15 +924,15 @@ public class ExcelUtil } } } - else if (cell.getCellTypeEnum() == CellType.STRING) + else if (cell.getCellType() == CellType.STRING) { val = cell.getStringCellValue(); } - else if (cell.getCellTypeEnum() == CellType.BOOLEAN) + else if (cell.getCellType() == CellType.BOOLEAN) { val = cell.getBooleanCellValue(); } - else if (cell.getCellTypeEnum() == CellType.ERROR) + else if (cell.getCellType() == CellType.ERROR) { val = cell.getErrorCellValue(); }