From 78e5d37cf3b889bb63d8ca4317ada55c69bf73bc Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 18 Jul 2023 17:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE-=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryitem/dto/SalaryFieldListDTO.java | 4 ++-- .../salary/entity/salaryitem/dto/SalaryItemFormDTO.java | 2 +- .../salary/entity/salaryitem/dto/SalaryItemListDTO.java | 4 ++-- .../salary/entity/salaryitem/dto/SalaryItemSobListDTO.java | 4 ++-- .../salary/entity/salaryitem/param/SalaryItemSaveParam.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryFieldListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryFieldListDTO.java index b7461398b..e8a2afa8f 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryFieldListDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryFieldListDTO.java @@ -41,8 +41,8 @@ public class SalaryFieldListDTO { private Integer useDefault; //核算时隐藏 - @SalaryTableColumn(text = "默认隐藏", width = "10%", column = "hideDefault") - @TableTitle(title = "默认隐藏",dataIndex = "hideDefault",key = "hideDefault") + @SalaryTableColumn(text = "核算时隐藏", width = "10%", column = "hideDefault") + @TableTitle(title = "核算时隐藏",dataIndex = "hideDefault",key = "hideDefault") private Integer hideDefault; //进位规则 diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java index 5585bc530..c00b85844 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java @@ -42,7 +42,7 @@ public class SalaryItemFormDTO { //默认使用") private Integer useDefault; - //默认隐藏") + //核算时隐藏") private Integer hideDefault; //薪资档案引用") diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java index 02c51998c..adb0dc4b1 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java @@ -52,8 +52,8 @@ public class SalaryItemListDTO { private Integer useDefault; //核算时隐藏 - @SalaryTableColumn(text = "默认隐藏", width = "10%", column = "hideDefault") - @TableTitle(title = "默认隐藏",dataIndex = "hideDefault",key = "hideDefault") + @SalaryTableColumn(text = "核算时隐藏", width = "10%", column = "hideDefault") + @TableTitle(title = "核算时隐藏",dataIndex = "hideDefault",key = "hideDefault") private Integer hideDefault; //进位规则 diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java index 78bc4a84f..ae0ecf30f 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSobListDTO.java @@ -50,8 +50,8 @@ public class SalaryItemSobListDTO { private Integer useDefault; //核算时默认隐藏 - @SalaryTableColumn(text = "默认隐藏", width = "10%", column = "hideDefault") - @TableTitle(title = "默认隐藏",dataIndex = "hideDefault",key = "hideDefault") + @SalaryTableColumn(text = "核算时隐藏", width = "10%", column = "hideDefault") + @TableTitle(title = "核算时隐藏",dataIndex = "hideDefault",key = "hideDefault") private Integer hideDefault; //进位规则 diff --git a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java index 5d5db6cb1..a2c6fa84b 100644 --- a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java +++ b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java @@ -50,7 +50,7 @@ public class SalaryItemSaveParam { private Integer useInEmployeeSalary; //核算时默认隐藏 - @DataCheck(require = true, message = "默认隐藏不允许为空") + @DataCheck(require = true, message = "核算时隐藏不允许为空") private Integer hideDefault;