Merge branch 'feature/geoharbour' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour

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

@@ -60,11 +60,11 @@ public class StaffTableVO {
      */
     @OrganizationTableColumn(labelId = 547331, text = "部门", width = "10%", column = "dept_id", transmethod = "com.engine.organization.transmethod.DepartmentTransMethod.getSpanById")
     private String deptId;
-    /**
+//    /**
-     * 岗位
+//     * 岗位
-     */
+//     */
-    @OrganizationTableColumn(labelId = 547333, text = "岗位", width = "10%", column = "job_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSpanById")
+//    @OrganizationTableColumn(labelId = 547333, text = "岗位", width = "10%", column = "job_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSpanById")
-    private String jobId;
+//    private String jobId;
     /**
      * 编制数
      */