diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java index 79f4b04c..b4be9bff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java @@ -118,7 +118,7 @@ public class RemindMsgExcel implements Serializable { * 生产标识 */ @ColumnWidth(20) - @ExcelProperty("生产标识") +// @ExcelProperty("生产标识") private String prodFlagText; /** * 参数1 diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/消息提醒.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/消息提醒.xls index 54354cca..4c0c6a8d 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/QA/消息提醒.xls and b/blade-service/blade-desk/src/main/resources/Excel/QA/消息提醒.xls differ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml index 63675369..0b730a5a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml @@ -82,7 +82,6 @@ and role_id like '%' || #{user.roleId} || '%' --- and real_name = #{user.realName} and real_name like '%' || #{user.realName} || '%'