Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

b07298a3 · “yiyousong” · c972ec4b · b2831854 · b07298a3
Commit b07298a3 authored Jun 28, 2023 by “yiyousong”
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java ...ava/com/mortals/xhx/module/window/model/WindowEntity.java +3 -3

No files found.
--- a/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java
@@ -45,17 +45,17 @@ public class WindowEntity extends WindowVo {
    /**
     * 区域
     */
-    @Excel(name = "用户名")
+    @Excel(name = "区域")
    private String region;
    /**
     * 英语区域
     */
-    @Excel(name = "用户名")
+    @Excel(name = "英语区域")
    private String englishRegion;
    /**
     * 窗口编号
     */
-    @Excel(name = "用户名")
+    @Excel(name = "窗口编号")
    private String fromnum;
    /**
     * 红旗窗口 (1.是，0.否)