diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index dd67753..948b81a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -59,9 +59,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 50MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 50MB # 服务模块 devtools: restart: diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 8442f94..48827c5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -32,7 +32,7 @@ public class SysDept extends BaseEntity private String ancestors; /** 部门名称 */ - @Excel(name = "部门名称") + @Excel(name = "行政区划名称") private String deptName; /** 显示顺序 */ @@ -57,11 +57,11 @@ public class SysDept extends BaseEntity private String parentName; /** 导入代码 */ - @Excel(name = "导入代码") + @Excel(name = "导入级联代码") private String importCode; /** 行政代码 */ - @Excel(name = "行政代码") + @Excel(name = "行政区划代码") private String orgCode; /** 经度 */ diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 8bfeeea..b171afb 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -163,11 +163,11 @@
将文件拖到此处,或点击上传
-
+
- 是否更新已经存在的${functionName} + 是否更新已经存在的${functionName}
- 仅允许导入xls、xlsx格式文件。 +

1、仅允许导入xls、xlsx格式文件;

下载模板