用户

jeecg-boot-master/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -528,7 +528,6 @@ public class SysUserController {
                                 sysUserRole.setRoleId("1724327596426760194");
                                 sysUserRoleService.save(sysUserRole);
                             } else {
-                                errorMessage.add("第 " + i + 1 + " 行：目前仅允许导入学生身份的用户，其他身份请手动导入");
                             }
                         }
                         successLines++;
@@ -1772,7 +1771,7 @@ public class SysUserController {
         mv.addObject(NormalExcelConstants.FILE_NAME, "学生导入模板");
         mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams("学生导入模板", "用户名和学号均为学号" , "学生导入模板");
+        ExportParams  exportParams=new ExportParams("学生导入模板", "用户名和学号均为学号（仅允许学生身份导入）" , "学生导入模板");
         exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload());
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
         mv.addObject(NormalExcelConstants.PARAMS,exportParams);

jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAward.data.ts

@@ -28,7 +28,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'annucompid',
   },
   {
-    title: '第一名奖项名称',
+    title: '第一等奖项名称',
     align: 'center',
     dataIndex: 'firstPrize',
   },
@@ -43,7 +43,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'firstWeight',
   },
   {
-    title: '第二名奖项名称',
+    title: '第二等奖项名称',
     align: 'center',
     dataIndex: 'secondPrize',
   },
@@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'secondWeight',
   },
   {
-    title: '第三名奖项名称',
+    title: '第三等奖项名称',
     align: 'center',
     dataIndex: 'thirdPrize',
   },
@@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'thirdWeight',
   },
   {
-    title: '第四名奖项名称',
+    title: '第四等奖项名称',
     align: 'center',
     dataIndex: 'fourthPrize',
   },
@@ -88,7 +88,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'fourthWeight',
   },
   {
-    title: '第五名奖项名称',
+    title: '第五等奖项名称',
     align: 'center',
     dataIndex: 'fifthPrize',
   },
@@ -138,7 +138,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '第一名奖项名称',
+    label: '第一等奖项名称',
     field: 'firstPrize',
     component: 'Input',
     show:renderCallbackParams => {
@@ -185,7 +185,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '第二名奖项名称',
+    label: '第二等奖项名称',
     field: 'secondPrize',
     component: 'Input',
     show:renderCallbackParams => {
@@ -223,7 +223,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '第三名奖项名称',
+    label: '第三等奖项名称',
     field: 'thirdPrize',
     component: 'Input',
     show:renderCallbackParams => {
@@ -261,7 +261,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '第四名奖项名称',
+    label: '第四等奖项名称',
     field: 'fourthPrize',
     component: 'Input',
     show:renderCallbackParams => {
@@ -299,7 +299,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '第五名奖项名称',
+    label: '第五等奖项名称',
     field: 'fifthPrize',
     component: 'Input',
     show:renderCallbackParams => {