From adcff04c70567f4b1e74ec2c8dcecbb5164f94ec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Sep 2022 09:43:35 +0800
Subject: [PATCH] 1、增加轮播图维护 2、修复队伍接口报错
---
src/main/java/org/springblade/modules/system/excel/UserExcels.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcels.java b/src/main/java/org/springblade/modules/system/excel/UserExcels.java
index 44f4221..54e80db 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcels.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcels.java
@@ -38,6 +38,11 @@
public class UserExcels implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ColumnWidth(20)
+ @ExcelProperty("保安系统用户ID")
+ private String securityId;
+
@ColumnWidth(15)
@ExcelProperty("账户")
private String account;
@@ -69,34 +74,35 @@
@ExcelProperty("性别")
private Integer sex;
- @ColumnWidth(20)
- @ExcelProperty("角色ID")
- private String roleId;
+// @ColumnWidth(20)
+// @ExcelProperty("角色ID")
+// private String roleId;
- @ColumnWidth(10)
- @ExcelProperty("是否在职")
- private Integer status;
+// @ColumnWidth(10)
+// @ExcelProperty("是否在职")
+// private Integer status;
- @ColumnWidth(10)
- @ExcelProperty("是否删除")
- private Integer isDeleted;
+// @ColumnWidth(10)
+// @ExcelProperty("是否删除")
+// private Integer isDeleted;
@ColumnWidth(10)
@ExcelProperty("审查状态")
private String examinationType;
- @ColumnWidth(15)
- @ExcelProperty("审查明细")
- private String examinationMx;
+// @ColumnWidth(15)
+// @ExcelProperty("审查明细")
+// private String examinationMx;
- @ColumnWidth(15)
- @ExcelProperty("辖区ID")
- private String jurisdiction;
+// @ColumnWidth(15)
+// @ExcelProperty("辖区ID")
+// private String jurisdiction;
@ColumnWidth(20)
@ExcelProperty("身份证号码")
private String cardid;
+
}
--
Gitblit v1.9.3