Pre Merge pull request !221 from reset/feature/cl

src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java

@@ -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;
 }

src/com/engine/organization/entity/scheme/vo/GradeTableVO.java

@@ -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;
 }

src/com/engine/organization/entity/scheme/vo/LevelTableVO.java

@@ -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;
 }

src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java

@@ -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;
 }

src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java

@@ -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;
 }