Merge pull request 'feature/dxf' (#269) from feature/dxf into develop

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/269

src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java

@@ -42,7 +42,7 @@ import lombok.NoArgsConstructor;
 public class ManagerDetachVO {
 
 
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
 

src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java

@@ -32,7 +32,7 @@ import lombok.NoArgsConstructor;
 )
 public class EmployeeTableVO {
 
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
     @OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname")

src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java

@@ -2,6 +2,7 @@ package com.engine.organization.entity.hrmresource.vo;
 
 import com.cloudstore.eccom.pc.table.WeaTableType;
 import com.engine.organization.annotation.OrganizationTable;
+import com.engine.organization.annotation.OrganizationTableColumn;
 import com.engine.organization.annotation.OrganizationTableOperate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -40,6 +41,6 @@ public class HrmResourceJclVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 }

src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java

@@ -45,7 +45,7 @@ public class HrmResourceVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
     /**

src/com/engine/organization/entity/hrmresource/vo/ScHrmResourceVO.java

@@ -44,7 +44,7 @@ public class ScHrmResourceVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
     /**

src/com/engine/organization/entity/jclimport/vo/JclImportHistoryDetailVO.java

@@ -25,7 +25,7 @@ import lombok.NoArgsConstructor;
         primarykey = "id"
 )
 public class JclImportHistoryDetailVO {
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     @OrganizationTableColumn(text = "行", width = "15%", column = "row_nums")
     private String rowNums;

src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java

@@ -37,7 +37,7 @@ import lombok.NoArgsConstructor;
 )
 public class CardAccessVO {
 
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
     @OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name",transmethod = "com.engine.organization.transmethod.CardAccessTrans.getMultiLanguage",multiLanguage = true)

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

@@ -43,7 +43,7 @@ public class PostInfoTableVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 编号

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

@@ -43,12 +43,12 @@ public class GradeTableVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 是否被引用
      */
-    //@OrganizationTableColumn(column = "isUsed", display = false)
+    @OrganizationTableColumn(column = "isUsed", display = false)
     private Integer isUsed;
     /**
      * 编号

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

@@ -40,12 +40,12 @@ public class LevelTableVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 是否被引用
      */
-    //@OrganizationTableColumn(column = "isUsed", display = false)
+    @OrganizationTableColumn(column = "isUsed", display = false)
     private Integer isUsed;
 
     /**

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

@@ -40,12 +40,12 @@ public class SchemeTableVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 是否被引用
      */
-    //@OrganizationTableColumn(column = "isUsed", display = false)
+    @OrganizationTableColumn(column = "isUsed", display = false)
     private Integer isUsed;
 
     /**

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

@@ -47,12 +47,12 @@ public class SequenceTableVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 是否被引用
      */
-    //@OrganizationTableColumn(column = "isUsed", display = false)
+    @OrganizationTableColumn(column = "isUsed", display = false)
     private Integer isUsed;
     /**
      * 编号

src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java

@@ -41,7 +41,7 @@ public class StaffPlanTableVO {
     /**
      * 是否被引用
      */
-    //@OrganizationTableColumn(column = "isUsed", display = false)
+    @OrganizationTableColumn(column = "isUsed", display = false)
     private Integer isUsed;
     /**
      * 编号

src/com/engine/organization/entity/staff/vo/StaffTableVO.java

@@ -33,12 +33,12 @@ public class StaffTableVO {
     /**
      * 主键
      */
-    //@OrganizationTableColumn(column = "id", display = false)
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 是否被引用
      */
-    //@OrganizationTableColumn(column = "isUsed", display = false)
+    @OrganizationTableColumn(column = "isUsed", display = false)
     private Integer isUsed;
     /**
      * 方案id