LiGuang 3 éve
szülő
commit
1345687ce5

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -195,16 +195,16 @@ public class SysUser implements Serializable {
     @Excel(name = "家庭住址", width = 15)
     private String addr;
     /**用户所属组织**/
-   // @Excel(name = "一级部门", width = 15)
+    @Excel(name = "一级部门", width = 15)
     private transient  String del2;
     /**用户所属组织**/
-   // @Excel(name = "二级部门", width = 15)
+    @Excel(name = "二级部门", width = 15)
     private  transient String del3;
     /**用户所属组织**/
-    //@Excel(name = "三级部门", width = 15)
+    @Excel(name = "三级部门", width = 15)
     private transient  String del4;
     /**部门名称*/
-    //@Excel(name = "*末级部门", width = 15)
+    @Excel(name = "*末级部门", width = 15)
     private transient String orgCodeTxt;
 
     /**入职日期**/
@@ -453,10 +453,10 @@ public class SysUser implements Serializable {
 
     private transient String empStatus;
 
-    //@Excel(name = "*合同类型", width = 15,dicCode = "contract_type")
+    @Excel(name = "*合同类型", width = 15,dicCode = "contract_type")
     private transient String contractType;
 
-    //@Excel(name = "*合同结束日期", width = 15,format = "yyyy-MM-dd")
+    @Excel(name = "*合同结束日期", width = 15,format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private transient Date cEndDate;