From 913ced8791ef8720fe0da0ff98c4a5bd1f35c8b9 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Wed, 25 Nov 2020 11:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E7=94=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=9B=9E=E6=98=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/fantang/domain/FtStaffInfoDao.java | 2 +- .../system/fantang/domain/FtSubsidyDao.java | 2 +- .../src/views/fantang/staffInfo/index.vue | 11 +- ruoyi-ui/src/views/fantang/subsidy/index.vue | 10 +- ruoyi-ui/src/views/index.vue | 428 ------------------ 5 files changed, 20 insertions(+), 433 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java index c191fb4e9..8df8460d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java @@ -81,7 +81,7 @@ public class FtStaffInfoDao implements Serializable { * 启用标志 */ @Excel(name = "启用标志") - private Integer flag; + private Boolean flag; /** * 补贴余额 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSubsidyDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSubsidyDao.java index 4387958e2..fb062a9b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSubsidyDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSubsidyDao.java @@ -51,7 +51,7 @@ private static final long serialVersionUID=1L; private String cycle; /** 启用标志 */ - private Integer flag; + private Boolean flag; /** 创建日期 */ @Excel(name = "创建日期" , width = 30, dateFormat = "yyyy-MM-dd") diff --git a/ruoyi-ui/src/views/fantang/staffInfo/index.vue b/ruoyi-ui/src/views/fantang/staffInfo/index.vue index 3f9f1b9ce..b4d6d6d75 100644 --- a/ruoyi-ui/src/views/fantang/staffInfo/index.vue +++ b/ruoyi-ui/src/views/fantang/staffInfo/index.vue @@ -94,14 +94,13 @@ - - + - + @@ -439,9 +14,6 @@ export default { }; }, methods: { - goTarget(href) { - window.open(href, "_blank"); - }, }, };