Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

 Conflicts:

	src/com/engine/organization/entity/SelectOptionParam.java

src/com/api/organization/web/CodeSettingController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/30
  * @Version V1.0
  **/

src/com/api/organization/web/CompController.java

@@ -3,7 +3,7 @@ package com.api.organization.web;
 import javax.ws.rs.Path;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/17
  * @version: 1.0

src/com/api/organization/web/DemoController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/4/26
  * @Version V1.0
  **/

src/com/api/organization/web/DepartmentController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/20
  * @Version V1.0
  **/

src/com/api/organization/web/FieldDefinedController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/6/13
  * @Version V1.0
  **/

src/com/api/organization/web/GradeController.java

@@ -3,7 +3,7 @@ package com.api.organization.web;
 import javax.ws.rs.Path;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/11
  * @version: 1.0

src/com/api/organization/web/GroupController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  *
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/16
  * @version: 1.0

src/com/api/organization/web/JobController.java

@@ -3,7 +3,7 @@ package com.api.organization.web;
 import javax.ws.rs.Path;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/27
  * @version: 1.0

src/com/api/organization/web/LevelController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  *
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/10
  * @version: 1.0

src/com/api/organization/web/PostController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  *
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/api/organization/web/PostInfoController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  *
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/api/organization/web/SchemeController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  *
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/10
  * @version: 1.0

src/com/api/organization/web/SequenceController.java

@@ -4,7 +4,7 @@ import javax.ws.rs.Path;
 
 /**
  *
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/12
  * @version: 1.0

src/com/api/organization/web/StaffController.java

@@ -3,7 +3,7 @@ package com.api.organization.web;
 import javax.ws.rs.Path;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/api/organization/web/StaffPlanController.java

@@ -3,7 +3,7 @@ package com.api.organization.web;
 import javax.ws.rs.Path;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/annotation/CheckboxPopedom.java

@@ -4,7 +4,7 @@ import java.lang.annotation.*;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/30
  * @Version V1.0
  **/

src/com/engine/organization/annotation/Log.java

@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/annotation/OperatePopedom.java

@@ -4,7 +4,7 @@ import java.lang.annotation.*;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/30
  * @Version V1.0
  **/

src/com/engine/organization/annotation/OrganizationTable.java

@@ -8,7 +8,7 @@ import java.lang.annotation.*;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/annotation/OrganizationTableColumn.java

@@ -4,7 +4,7 @@ import java.lang.annotation.*;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/annotation/OrganizationTableOperate.java

@@ -4,7 +4,7 @@ import java.lang.annotation.*;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/entity/DeleteParam.java

@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/entity/LoggerContext.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @Author weaver_cl
- * @Description: TODO 日志实体类 hr_log
+ * @description: 日志实体类 hr_log
  * @Date 2022/4/27
  * @Version V1.0
  **/

src/com/engine/organization/entity/TopTab.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/11
  * @version: 1.0

src/com/engine/organization/entity/TreeData.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/engine/organization/entity/codesetting/bo/CodeSettingBO.java

@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/entity/codesetting/param/CodeBaseParam.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/entity/codesetting/param/CodeSaveDetailParam.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/entity/codesetting/param/CodeSaveParam.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/entity/codesetting/po/CodeRuleDetailPO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/30
  * @Version V1.0
  **/

src/com/engine/organization/entity/codesetting/po/CodeRulePO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/30
  * @Version V1.0
  **/

src/com/engine/organization/entity/codesetting/po/CodeRuleReservedPO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @Description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/entity/company/bo/CompBO.java

@@ -15,7 +15,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/16
  * @version: 1.0

src/com/engine/organization/entity/company/dto/CompListDTO.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 import java.util.List;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/16
  * @version: 1.0

src/com/engine/organization/entity/company/param/CompSearchParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/16
  * @version: 1.0

src/com/engine/organization/entity/company/po/CompPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/16
  * @version: 1.0

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/20
  * @Version V1.0
  **/

src/com/engine/organization/entity/department/dto/DepartmentListDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/19
  * @Version V1.0
  **/

src/com/engine/organization/entity/department/param/DepartmentMergeParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/02
  * @version: 1.0

src/com/engine/organization/entity/department/param/DepartmentMoveParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/02
  * @version: 1.0

src/com/engine/organization/entity/department/param/DeptCopyParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/01
  * @version: 1.0

src/com/engine/organization/entity/department/param/DeptSearchParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/23
  * @version: 1.0

src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/20
  * @Version V1.0
  **/

src/com/engine/organization/entity/department/po/DepartmentPO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/19
  * @Version V1.0
  **/

src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/20
  * @Version V1.0
  **/

src/com/engine/organization/entity/employee/Employee.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/20
  * @Version V1.0
  **/

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

@@ -1,7 +1,7 @@
 package com.engine.organization.entity.employee.vo;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/31
  * @version: 1.0

src/com/engine/organization/entity/extend/ExtendInfoOperateType.java

@@ -1,7 +1,7 @@
 package com.engine.organization.entity.extend;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/13
  * @version: 1.0

src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java

@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/19
  * @version: 1.0

src/com/engine/organization/entity/extend/po/ExtendGroupPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/18
  * @version: 1.0

src/com/engine/organization/entity/extend/po/ExtendInfoPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/19
  * @version: 1.0

src/com/engine/organization/entity/fieldset/TypeTreeDTO.java

@@ -5,9 +5,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/6/13
  * @Version V1.0
  **/
@@ -17,20 +19,48 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class TypeTreeDTO {
 
+    //是否可以增加子节点 默认都为false
     private boolean addChild;
 
     private boolean canCanceled;
 
+    //当前节点是否可点击
     private boolean canClick;
 
+    //树id
     private String domid;
 
+    //是否存在分组title
     private boolean hasGroup;
 
+    //是否有子节点
     private boolean haschild;
 
+    //是否是叶子节点
     private boolean isLeaf;
 
+    //是否是父节点
     private boolean isParent;
 
+    //是否默认选中
+    private boolean isSelected;
+
+    //是否展示
+    private String isShow;
+
+    //是否默认展开
+    private boolean isopen;
+
+    //键
+    private String key;
+
+    //树名称
+    private String name;
+
+    //子节点
+    private List<TypeTreeDTO> subs;
+
+    //
+    private int viewAttr;
+
 }

src/com/engine/organization/entity/job/bo/JobBO.java

@@ -13,7 +13,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/30
  * @version: 1.0

src/com/engine/organization/entity/job/dto/JobListDTO.java

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 import java.util.List;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/30
  * @version: 1.0

src/com/engine/organization/entity/job/param/JobCopyParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/01
  * @version: 1.0

src/com/engine/organization/entity/job/param/JobSearchParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/30
  * @version: 1.0

src/com/engine/organization/entity/job/po/JobDTPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/31
  * @version: 1.0

src/com/engine/organization/entity/job/po/JobPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/30
  * @version: 1.0

src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 import java.util.List;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/02
  * @version: 1.0

src/com/engine/organization/entity/po/Demo.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/4/26
  * @Version V1.0
  **/

src/com/engine/organization/entity/postion/dto/PostDTO.java

@@ -5,7 +5,7 @@ import com.engine.organization.entity.postion.po.PostPO;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/engine/organization/entity/postion/dto/PostInfoDTO.java

@@ -6,7 +6,7 @@ import com.engine.organization.entity.postion.po.PostInfoPO;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/engine/organization/entity/postion/po/PostInfoPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/engine/organization/entity/postion/po/PostPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

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

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/13
  * @version: 1.0

src/com/engine/organization/entity/scheme/dto/GradeDTO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/11
  * @Version V1.0
  **/

src/com/engine/organization/entity/scheme/dto/LevelDTO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/entity/scheme/dto/SchemeDTO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.Map;
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/entity/scheme/param/GradeSearchParam.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/11
  * @Version V1.0
  **/

src/com/engine/organization/entity/scheme/param/LevelSearchParam.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/entity/scheme/param/SchemeSearchParam.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/9
  * @Version V1.0
  **/

src/com/engine/organization/entity/scheme/po/GradePO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/11
  * @version: 1.0

src/com/engine/organization/entity/scheme/po/LevelPO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 /**
  *
- * @description: TODO 
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/09
  * @version: 1.0

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/11
  * @version: 1.0

src/com/engine/organization/entity/searchtree/SearchTree.java

@@ -4,7 +4,7 @@ import com.api.hrm.bean.TreeNode;
 import lombok.Data;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/26
  * @version: 1.0

src/com/engine/organization/entity/searchtree/SearchTreeParams.java

@@ -3,7 +3,7 @@ package com.engine.organization.entity.searchtree;
 import lombok.Data;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/26
  * @version: 1.0

src/com/engine/organization/entity/sequence/dto/SequenceDTO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/11
  * @Version V1.0
  **/

src/com/engine/organization/entity/sequence/param/SequenceSearchParam.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * @Author dxfeng
- * @Description: TODO
+ * @description:
  * @Date 2022/5/12
  * @Version V1.0
  **/

src/com/engine/organization/entity/sequence/po/SequencePO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/12
  * @version: 1.0

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/12
  * @version: 1.0

src/com/engine/organization/entity/staff/bo/StaffBO.java

@@ -7,7 +7,7 @@ import com.engine.organization.transmethod.StaffTransMethod;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/entity/staff/bo/StaffPlanBO.java

@@ -8,7 +8,7 @@ import weaver.general.StringUtil;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/entity/staff/param/StaffPlanSearchParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/entity/staff/param/StaffSearchParam.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/entity/staff/po/StaffPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/entity/staff/po/StaffPlanPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/24
  * @version: 1.0

src/com/engine/organization/entity/staff/po/StaffsPO.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/07
  * @version: 1.0

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/05/25
  * @version: 1.0

src/com/engine/organization/enums/DeleteTypeEnum.java

@@ -2,7 +2,7 @@ package com.engine.organization.enums;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/4/28
  * @Version V1.0
  **/

src/com/engine/organization/enums/OperateTypeEnum.java

@@ -2,7 +2,7 @@ package com.engine.organization.enums;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/4/28
  * @Version V1.0
  **/

src/com/engine/organization/enums/OrganizationTypeEnum.java

@@ -0,0 +1,12 @@
+package com.engine.organization.enums;
+
+/**
+ * @Author weaver_cl
+ * @description:
+ * @Date 2022/6/14
+ * @Version V1.0
+ **/
+public enum OrganizationTypeEnum {
+
+
+}

src/com/engine/organization/enums/RuleCodeTypeEnum.java

@@ -3,7 +3,7 @@ package com.engine.organization.enums;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/exception/OrganizationRunTimeException.java

@@ -2,7 +2,7 @@ package com.engine.organization.exception;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/4/26
  * @Version V1.0
  **/

src/com/engine/organization/mapper/DemoMapper.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/3/9
  * @Version V1.0
  **/

src/com/engine/organization/mapper/SISLog/SISLogMapper.java

@@ -4,7 +4,7 @@ import com.engine.organization.entity.LoggerContext;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/4/28
  * @Version V1.0
  **/

src/com/engine/organization/mapper/codesetting/CodeRuleDetailMapper.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/mapper/codesetting/CodeRuleMapper.java

@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * @Author weaver_cl
- * @Description: TODO
+ * @description:
  * @Date 2022/5/31
  * @Version V1.0
  **/

src/com/engine/organization/mapper/common/RefreshUseMapper.java

@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.Collection;
 
 /**
- * @description: TODO
+ * @description:
  * @author:dxfeng
  * @createTime: 2022/06/01
  * @version: 1.0