diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java index ebcbb6a..f3a2fb4 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java @@ -62,7 +62,7 @@ public class BgPartymatter implements Serializable { private java.lang.String year; /**会议类型*/ @Excel(name = "会议类型", width = 15, dicCode = "meeting_type") - @ExcelColumn(name = "会议类型", width = 15, dicCode = "meeting_type") +// @ExcelColumn(name = "会议类型", width = 15, dicCode = "meeting_type") @Schema(description = "会议类型:party党委会,office所务会") @TableField("meeting_type") private java.lang.String meetingType; diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java index 5ac05f8..e44bc3a 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java @@ -185,17 +185,17 @@ public class BgTakepulse implements Serializable { private java.lang.String superviseCount; /**紧急程度*/ @Excel(name = "紧急程度", width = 15) - @ExcelColumn(name = "紧急程度", width = 15) +// @ExcelColumn(name = "紧急程度", width = 15) @Schema(description = "紧急程度") private java.lang.String urgencyLevel; /**是否需要所办领导审批*/ @Excel(name = "是否需要所办领导审批", width = 15, dicCode = "yn") - @ExcelColumn(name = "是否需要所办领导审批", width = 15, dicCode = "yn") +// @ExcelColumn(name = "是否需要所办领导审批", width = 15, dicCode = "yn") @Schema(description = "是否需要所办领导审批") private java.lang.String isNeedAppro; /**所办领导*/ @Excel(name = "所办领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") - @ExcelColumn(name = "所办领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") +// @ExcelColumn(name = "所办领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") @Schema(description = "所办领导") private java.lang.String supDeptleaderid;