Commit Graph

1511 Commits

Author SHA1 Message Date
dxfeng 090c2659df 岗位表单更改 2022-05-31 09:56:50 +08:00
dxfeng 0a8de34788 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-05-31 09:42:06 +08:00
reset 6601f117cd
!31 编号管理
Merge pull request !31 from reset/feature/cl
2022-05-31 01:20:40 +00:00
Chengliang b4de9ae287 编号管理 2022-05-31 09:19:04 +08:00
dxfeng 03e0f6ee60 包名更改 2022-05-31 09:09:13 +08:00
dxfeng 46e7a57b5e
!30 包名更改
Merge pull request !30 from dxfeng/feature/dxf
2022-05-31 01:08:31 +00:00
dxfeng 7927a3ceea 包名更改 2022-05-31 09:06:57 +08:00
dxfeng cd94b186d0
!29 职务管理模块开发
Merge pull request !29 from dxfeng/feature/dxf
2022-05-30 10:40:25 +00:00
dxfeng 91c4116529 职务管理模块开发 2022-05-30 18:39:03 +08:00
reset b9d3ff53c9
!28 操作菜单权限
Merge pull request !28 from reset/feature/cl
2022-05-30 08:25:22 +00:00
Chengliang 3ac4461f8b table操作菜单权限 2022-05-30 16:21:15 +08:00
dxfeng d2d1b1e759
!27 部门、岗位接口开发;代码合并
Merge pull request !27 from dxfeng/feature/dxf
2022-05-29 14:04:02 +00:00
dxfeng 92953661ff 部门、岗位接口开发;代码合并 2022-05-29 21:41:20 +08:00
dxfeng 33f5ec9458 部门、岗位接口开发;代码合并 2022-05-27 22:20:22 +08:00
dxfeng 1ae3dcdec0 11 2022-05-27 18:05:15 +08:00
reset ebdc72a15b
!26 check框控制
Merge pull request !26 from reset/feature/cl
2022-05-27 09:09:20 +00:00
Chengliang 5eabc87fb3 checkbox控制 2022-05-27 17:04:35 +08:00
dxfeng d003e7a135
!25 编制方案 年度字段优化
Merge pull request !25 from dxfeng/feature/dxf
2022-05-26 05:55:50 +00:00
dxfeng 30ef0c2d84 编制方案 年度字段优化 2022-05-26 13:55:04 +08:00
dxfeng d20e8079d7
!24 编制表接口
Merge pull request !24 from dxfeng/feature/dxf
2022-05-26 03:07:27 +00:00
dxfeng 4abede9170 编制表接口 2022-05-26 11:06:39 +08:00
dxfeng 51ae24ea44 编制表接口 2022-05-26 11:03:04 +08:00
dxfeng 4102c56e7c
!23 编制表接口 表结构更新
Merge pull request !23 from dxfeng/feature/dxf
2022-05-26 02:11:58 +00:00
dxfeng b18133f790 编制表接口 表结构更新 2022-05-26 10:11:02 +08:00
reset 15cccfaed4
!22 生产合并
Merge pull request !22 from reset/develop
2022-05-26 02:06:57 +00:00
reset de28bd11b1
!21 联查部门修改
Merge pull request !21 from reset/feature/cl
2022-05-26 02:05:59 +00:00
Chengliang c3395b6509 联查部门修改 2022-05-26 10:04:04 +08:00
dxfeng b212122007 公司/分部BUG修复 编制方案接口 2022-05-25 16:37:44 +08:00
dxfeng 93aa9e7db3
!20 明细表更新BUG修复
Merge pull request !20 from dxfeng/feature/dxf
2022-05-25 02:57:42 +00:00
dxfeng 3578a0f166 明细表更新BUG修复 2022-05-25 10:56:53 +08:00
dxfeng 1181184bec
!19 分部列表分页 明细表字段展示 BUG修复
Merge pull request !19 from dxfeng/feature/dxf
2022-05-25 01:58:06 +00:00
dxfeng 477df79cd1 分部列表分页 明细表字段展示 BUG修复 2022-05-25 09:54:14 +08:00
dxfeng 33f1280579
!18 BUG修复 表结构更新
Merge pull request !18 from dxfeng/feature/dxf
2022-05-24 07:16:42 +00:00
dxfeng 01ab659ef3 BUG修复 表结构更新 2022-05-24 15:15:49 +08:00
dxfeng 273b3217c3
!17 部门管理模块接口 拓展表通用方法抽取
Merge pull request !17 from dxfeng/feature/dxf
2022-05-24 06:00:49 +00:00
dxfeng cb1b37e05d 部门管理模块接口 拓展表通用方法抽取 2022-05-24 13:53:41 +08:00
dxfeng cd6121f0b0 部门管理 新增表单 数据保存 2022-05-23 19:16:31 +08:00
dxfeng 12e435c1cb Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/impl/DepartmentServiceImpl.java
2022-05-23 17:50:06 +08:00
dxfeng cbd33dbd3b 部门管理 列表 字段文本展示 2022-05-23 17:46:37 +08:00
reset 01336ba314
!16 分页总数修改
Merge pull request !16 from reset/feature/cl
2022-05-23 09:34:34 +00:00
Chengliang f5561b8e7d 修改分页总数 2022-05-23 17:33:10 +08:00
dxfeng 39eebf62fc
!15 公司/分部 列表 字段文本展示
Merge pull request !15 from dxfeng/feature/dxf
2022-05-20 10:04:48 +00:00
dxfeng 4e391c5f7c 公司/分部 列表 字段文本展示 2022-05-20 18:03:27 +08:00
dxfeng e2b7ca0072
!14 公司/分部 编辑页面接口优化
Merge pull request !14 from dxfeng/feature/dxf
2022-05-20 09:36:01 +00:00
dxfeng a6a8053578 公司/分部 编辑页面接口优化 2022-05-20 17:34:18 +08:00
dxfeng 0cdfd1ed95
!13 公司/分部 编辑页面接口优化
Merge pull request !13 from dxfeng/feature/dxf
2022-05-20 08:32:04 +00:00
dxfeng b4f79d380e 公司/分部 编辑页面接口优化 2022-05-20 16:30:56 +08:00
dxfeng 11cd25a501
!12 公司/分部 拓展表 拓展明细表 接口
Merge pull request !12 from dxfeng/feature/dxf
2022-05-20 07:54:57 +00:00
dxfeng 0d0e7eaefe 公司/分部 拓展表 拓展明细表 接口 2022-05-20 15:52:44 +08:00
dxfeng 0b9a5878eb 公司/分部 拓展表 拓展明细表 接口 2022-05-20 15:52:25 +08:00