liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!221 table列宽修复 

Merge pull request !221 from reset/feature/cl
This commit is contained in:
reset 2022-09-02 03:29:07 +00:00 committed by Gitee
parent 385ff8331e f5fcbdaff8
commit 8ac890814f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
View File

@ -78,12 +78,12 @@ public class PostInfoTableVO {
/**
* 说明
*/
@OrganizationTableColumn(text = "说明", width = "20%", column = "description")
@OrganizationTableColumn(text = "说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

13
src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
View File

@ -60,11 +60,7 @@ public class GradeTableVO {
*/
@OrganizationTableColumn(text = "名称", width = "20%", column = "grade_name")
private String gradeName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
*/
@ -80,9 +76,14 @@ public class GradeTableVO {
@OrganizationTableColumn(text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId")
private String levelId;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private int forbiddenTag;
}

15
src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
View File

@ -59,21 +59,22 @@ public class LevelTableVO {
@OrganizationTableColumn(text = "名称", width = "20%", column = "level_name")
private String levelName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
*/
@OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
private String schemeName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

4
src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
View File

@ -61,12 +61,12 @@ public class SchemeTableVO {
/**
* 方案描述
*/
@OrganizationTableColumn(text = "方案说明", width = "25%", column = "scheme_description")
@OrganizationTableColumn(text = "方案说明", width = "40%", column = "scheme_description")
private String schemeDescription;
/**
* 禁用标识
*/
@OrganizationTableColumn(text = "是否启用", width = "25%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

13
src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
View File

@ -65,11 +65,6 @@ public class SequenceTableVO {
@OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name")
private String sequenceName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
@ -77,9 +72,15 @@ public class SequenceTableVO {
@OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
private String schemeName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}