Commit Graph

394 Commits

Author SHA1 Message Date
dxfeng 5f779e9bc4
!143 记录操作日志
Merge pull request !143 from dxfeng/feature/dxf
2022-07-06 02:15:51 +00:00
dxfeng c139cd408a 记录操作日志 2022-07-06 10:15:26 +08:00
dxfeng 8c0c8ace55
!142 记录操作日志,岗位优化
Merge pull request !142 from dxfeng/feature/dxf
2022-07-05 10:48:32 +00:00
dxfeng 4f52218e89 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-05 18:47:26 +08:00
reset 9b1d7a26d3
!141 需求优化
Merge pull request !141 from reset/feature/cl
2022-07-05 10:46:50 +00:00
dxfeng bef63439b2 记录操作日志 2022-07-05 18:46:43 +08:00
Chengliang 6c304e8a81 需求优化 2022-07-05 18:45:40 +08:00
dxfeng 02608d5108 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-05 18:45:03 +08:00
dxfeng 278194a4a3 记录操作日志,岗位优化 2022-07-05 18:44:45 +08:00
dxfeng 3923dab45b 记录操作日志 2022-07-05 15:17:22 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
dxfeng e85019a665
!140 操作日志
Merge pull request !140 from dxfeng/feature/dxf
2022-07-05 01:42:31 +00:00
dxfeng 618e30e6ef 操作日志 2022-07-05 09:42:09 +08:00
dxfeng 37142c3a3e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/impl/DemoServiceImpl.java
2022-07-05 09:39:51 +08:00
dxfeng 033e90aa34 操作日志 2022-07-05 09:39:00 +08:00
reset 01f3c8e7fe
!139 需求优化
Merge pull request !139 from reset/feature/cl
2022-07-04 09:54:38 +00:00
Chengliang 46aeddea39 需求调整 2022-07-04 17:51:31 +08:00
reset d103b0fec0
!138 去除weaverboot引用
Merge pull request !138 from reset/feature/cl
2022-07-04 06:26:27 +00:00
Chengliang eec9446dcd 去除weaverboot引用 2022-07-04 14:24:20 +08:00
dxfeng 6b96ea7ca0 人员列表 搜索条件 2022-07-04 10:01:28 +08:00
dxfeng 23212207b3
!137 人员列表查询系统表 异常信息处理
Merge pull request !137 from dxfeng/feature/dxf
2022-07-04 01:19:44 +00:00
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 2022-07-04 09:18:56 +08:00
dxfeng 5291c3b855 分部列表BUG修复 2022-07-01 17:46:25 +08:00
dxfeng 37abad0f84
!136 人员导入
Merge pull request !136 from dxfeng/feature/dxf
2022-07-01 07:38:59 +00:00
dxfeng 1a1646e818 人员导入 2022-07-01 15:37:25 +08:00
dxfeng 2ea2626585
!135 人员导入
Merge pull request !135 from dxfeng/feature/dxf
2022-07-01 06:03:03 +00:00
dxfeng fca0bb4dad 人员导入 2022-07-01 14:02:03 +08:00
dxfeng 3ffb85daba
!134 人员导入,日志表结构
Merge pull request !134 from dxfeng/feature/dxf
2022-06-30 08:26:32 +00:00
dxfeng d508a4d9d0 人员导入,日志表结构 2022-06-30 16:22:57 +08:00
dxfeng ecd6ba8f56
!133 人员导入
Merge pull request !133 from dxfeng/feature/dxf
2022-06-30 06:21:36 +00:00
dxfeng 66f5438d17 人员导入 2022-06-30 14:20:59 +08:00
dxfeng db5547008b
!132 人员导入
Merge pull request !132 from dxfeng/feature/dxf
2022-06-30 06:10:09 +00:00
dxfeng 1e7caac8ff 人员导入 2022-06-30 14:09:28 +08:00
dxfeng 655933236c 组织导入 2022-06-30 13:36:55 +08:00
dxfeng 26ef362eb4 组织导入 2022-06-30 11:17:59 +08:00
dxfeng eb8b647b52
!131 人员导入
Merge pull request !131 from dxfeng/feature/dxf
2022-06-29 10:31:36 +00:00
dxfeng 3f6b2c340b 人员导入 2022-06-29 18:29:45 +08:00
dxfeng 5eee5bdadf
!130 人员导入
Merge pull request !130 from dxfeng/feature/dxf
2022-06-29 09:09:26 +00:00
dxfeng c8b93b70b4 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 17:07:56 +08:00
dxfeng 82aa6c5a03 人员导入 2022-06-29 17:07:41 +08:00
reset be94ae88e7
!129 1
Merge pull request !129 from reset/feature/cl
2022-06-29 08:59:32 +00:00
Chengliang 5445e6bfac 导出和批量导出完成 2022-06-29 16:57:45 +08:00
Chengliang 300ccd6d77 “导出修改” 2022-06-29 15:21:36 +08:00
dxfeng 222e001c2b
!128 人员导入
Merge pull request !128 from dxfeng/feature/dxf
2022-06-29 06:51:12 +00:00
dxfeng 9b54954ef8 人员导入 2022-06-29 14:50:11 +08:00
dxfeng 354220fac3 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:31:49 +08:00
reset 610ca05dc4
!127 1
Merge pull request !127 from reset/feature/cl
2022-06-29 06:29:31 +00:00
Chengliang 34715a05e7 类导入 2022-06-29 14:27:52 +08:00
dxfeng 48171c7e82 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:21:17 +08:00
reset d4aa5d33a6
!126 人员导出
Merge pull request !126 from reset/feature/cl
2022-06-29 06:20:40 +00:00