 dxfeng
|
cca52d7080
|
记录操作日志
|
3 years ago |
|
dxfeng
|
c139cd408a
|
记录操作日志
|
3 years ago |
|
dxfeng
|
4f52218e89
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
 reset
|
9b1d7a26d3
|
!141 需求优化
Merge pull request !141 from reset/feature/cl
|
3 years ago |
|
dxfeng
|
bef63439b2
|
记录操作日志
|
3 years ago |
|
Chengliang
|
6c304e8a81
|
需求优化
|
3 years ago |
|
dxfeng
|
278194a4a3
|
记录操作日志,岗位优化
|
3 years ago |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
618e30e6ef
|
操作日志
|
3 years ago |
|
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
|
3 years ago |
|
dxfeng
|
033e90aa34
|
操作日志
|
3 years ago |
|
Chengliang
|
46aeddea39
|
需求调整
|
3 years ago |
|
Chengliang
|
eec9446dcd
|
去除weaverboot引用
|
3 years ago |
|
dxfeng
|
6b96ea7ca0
|
人员列表 搜索条件
|
3 years ago |
|
dxfeng
|
03f59d55d0
|
人员列表查询系统表 异常信息处理
|
3 years ago |
|
dxfeng
|
5291c3b855
|
分部列表BUG修复
|
3 years ago |
|
dxfeng
|
1a1646e818
|
人员导入
|
3 years ago |
|
dxfeng
|
fca0bb4dad
|
人员导入
|
3 years ago |
|
dxfeng
|
d508a4d9d0
|
人员导入，日志表结构
|
3 years ago |
|
dxfeng
|
66f5438d17
|
人员导入
|
3 years ago |
|
dxfeng
|
1e7caac8ff
|
人员导入
|
3 years ago |
|
dxfeng
|
655933236c
|
组织导入
|
3 years ago |
|
dxfeng
|
26ef362eb4
|
组织导入
|
3 years ago |
|
dxfeng
|
3f6b2c340b
|
人员导入
|
3 years ago |
|
dxfeng
|
c8b93b70b4
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
82aa6c5a03
|
人员导入
|
3 years ago |
|
reset
|
be94ae88e7
|
!129 1
Merge pull request !129 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
5445e6bfac
|
导出和批量导出完成
|
3 years ago |
|
Chengliang
|
300ccd6d77
|
“导出修改”
|
3 years ago |
|
dxfeng
|
9b54954ef8
|
人员导入
|
3 years ago |
|
dxfeng
|
354220fac3
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
34715a05e7
|
类导入
|
3 years ago |
|
dxfeng
|
48171c7e82
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
783b9fc6bf
|
人员导出
|
3 years ago |
|
dxfeng
|
5ceb8ae068
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
c14286bf94
|
人员导入
|
3 years ago |
|
dxfeng
|
ff06d705e7
|
人员导入
|
3 years ago |
|
dxfeng
|
2fb33877f5
|
人员导入
|
3 years ago |
|
Chengliang
|
0ad6157c26
|
人员导出功能
|
3 years ago |
|
dxfeng
|
4eef6f62de
|
人员导入
|
3 years ago |
|
Chengliang
|
82aa37e2ed
|
bug修复 增加导入
|
3 years ago |
|
dxfeng
|
d0ea50cec5
|
部门、岗位 合并
|
3 years ago |
|
dxfeng
|
db4e066294
|
复制分部 表结构更新
|
3 years ago |
|
dxfeng
|
ff5b1a2e1b
|
复制部门、岗位
|
3 years ago |
|
dxfeng
|
2ea923f9c9
|
转移分部
|
3 years ago |
|
dxfeng
|
15131186de
|
分部、部门、岗位列表排序
|
3 years ago |
|
dxfeng
|
6c40245b02
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
a2c768d0ab
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
e4dc4704ce
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
de1d4a8944
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f035662fb6
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
eeb8c47451
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f72db1b5f9
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
779e03cb32
|
修改时，编号可以修改
|
3 years ago |
|
dxfeng
|
9796bdc823
|
修改时，编号可以修改
|
3 years ago |
|
dxfeng
|
0b78da90ce
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
bdc813000e
|
人员管理查询条件 按钮接口，
是否禁用名称更改
|
3 years ago |
|
reset
|
9ab987c01b
|
!110 增加排序
Merge pull request !110 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
d3bcc35f31
|
增加排序
|
3 years ago |
|
dxfeng
|
5b6cf8fe72
|
人员管理新增、编辑相关接口
|
3 years ago |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
3 years ago |
|
dxfeng
|
fe0417618c
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
b8f866e28b
|
人员树接口
|
3 years ago |
|
Chengliang
|
4cbc15affd
|
优化
|
3 years ago |
|
dxfeng
|
d4e93eded4
|
BUG修复
|
3 years ago |
|
dxfeng
|
6474ce7128
|
BUG修复
|
3 years ago |
|
dxfeng
|
ad581a9c05
|
BUG修复
|
3 years ago |
|
dxfeng
|
abf99aaa51
|
BUG修复
|
3 years ago |
|
Chengliang
|
0ddecb1d2f
|
v1.2
|
3 years ago |
|
Chengliang
|
95744654b7
|
优化
|
3 years ago |
|
dxfeng
|
2af1fb6336
|
移动到组
|
3 years ago |
|
dxfeng
|
2a57f20693
|
BUG 修复
|
3 years ago |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
3 years ago |
|
dxfeng
|
f42ee2b8d1
|
BUG 修复
|
3 years ago |
|
dxfeng
|
20bafffd2f
|
BUG 修复
|
3 years ago |
|
dxfeng
|
caff3332ce
|
BUG 修复
|
3 years ago |
|
dxfeng
|
fdf2572654
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
|
3 years ago |
|
dxfeng
|
84adef0520
|
表结构更新
|
3 years ago |
|
dxfeng
|
e9aa68229d
|
表结构更新
|
3 years ago |
|
dxfeng
|
445507d10d
|
表结构更新
|
3 years ago |
|
reset
|
bb324ad8d1
|
!93 新增类型修改
Merge pull request !93 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
b60a335a1c
|
新增类型修改
|
3 years ago |
|
dxfeng
|
c8604a8e40
|
数据返回格式修改
|
3 years ago |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
3 years ago |
|
dxfeng
|
3ba19c1b8d
|
代码合并
|
3 years ago |
|
dxfeng
|
eb9c77b2d0
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
src/com/engine/organization/web/FieldDefinedController.java
src/com/engine/organization/wrapper/FieldDefinedWrapper.java
|
3 years ago |
|
Chengliang
|
6d4448ec51
|
子信息维护
|
3 years ago |
|
dxfeng
|
4d2a70ad5d
|
自定义字段列表接口
|
3 years ago |
|
dxfeng
|
08ca2e0c5d
|
自定义字段列表
|
3 years ago |
|
dxfeng
|
52c964f199
|
添加自定义字段接口
|
3 years ago |
|
dxfeng
|
57b29a2312
|
BUG修复
|
3 years ago |
|
dxfeng
|
e588fb0c96
|
BUG修复
|
3 years ago |
|
dxfeng
|
70de6bbbd7
|
处理代码冲突
|
3 years ago |
|
dxfeng
|
3f151d55e6
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
src/com/engine/organization/service/FieldDefinedService.java
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
src/com/engine/organization/web/FieldDefinedController.java
src/com/engine/organization/wrapper/FieldDefinedWrapper.java
|
3 years ago |
|
dxfeng
|
7c02e9bc61
|
分组删除 新增自定义字段
|
3 years ago |
|
Chengliang
|
8564d29bf1
|
新增类型默认title
|
3 years ago |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
3 years ago |
|
Chengliang
|
068c446765
|
solve conflict
|
3 years ago |
|
Chengliang
|
032a363985
|
自定义页面树
|
3 years ago |
|
dxfeng
|
c8112bd701
|
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
|
3 years ago |
