Commit Graph

430 Commits (80903cbbd1fc11d08cd7e167d5529ffc37baf861)
 

Author SHA1 Message Date
dxfeng 80903cbbd1
!157 分部、部门 添加UUID列;部门表结构更新
Merge pull request !157 from dxfeng/feature/dxf
3 years ago
dxfeng d55697bf5c Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 3 years ago
dxfeng fcb9761ae7 分部、部门 添加UUID列 3 years ago
dxfeng eaf8688acd
!156 分部更新EC
Merge pull request !156 from dxfeng/feature/dxf
3 years ago
dxfeng d72c68dec0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng e217ecbe16 分部更新EC 3 years ago
reset 98471b9756
!155 默认职务sql
Merge pull request !155 from reset/feature/cl
3 years ago
Chengliang 01ea1e8899 默认职务sql 3 years ago
reset 7f5568809c
!154 需求优化2
Merge pull request !154 from reset/feature/cl
3 years ago
Chengliang a1ed3e45c9 需求优化2 3 years ago
dxfeng 33151c57a4
!153 人员拓展卡片、分部更新EC
Merge pull request !153 from dxfeng/feature/dxf
3 years ago
dxfeng 3e9e3f59b6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 3 years ago
dxfeng 34dd115da1
!151 人员拓展卡片
Merge pull request !151 from dxfeng/feature/dxf
3 years ago
dxfeng 81fcd96af6 人员拓展卡片 3 years ago
dxfeng f19c20f6be
!150 BUG修复
Merge pull request !150 from dxfeng/feature/dxf
3 years ago
dxfeng 7ecd58d27b 删除webService 3 years ago
dxfeng 15a819a272 表结构更新 3 years ago
dxfeng 2bbf5367c6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng d760367a95 记录操作日志 3 years ago
670124965@qq.com 58f3aedf9d Merge branch 'feature/djp' into develop 3 years ago
dxfeng ed328996ea
!149 记录操作日志
Merge pull request !149 from dxfeng/feature/dxf
3 years ago
dxfeng 2175d7ca6a 记录操作日志 3 years ago
dxfeng 322217b335
!148 记录操作日志
Merge pull request !148 from dxfeng/feature/dxf
3 years ago
dxfeng 7103eb0c73 记录操作日志 3 years ago
dxfeng 71d6a40fbc
!147 记录操作日志
Merge pull request !147 from dxfeng/feature/dxf
3 years ago
dxfeng e83e3b90fc Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 40a7c066a2 记录操作日志 3 years ago
reset 4ce84936f5
!146 日期组合
Merge pull request !146 from reset/feature/cl
3 years ago
Chengliang 0bdcc18c56 日期组合改造 3 years ago
MustangDeng b589056585 组织结构图接口 3 years ago
dxfeng 990fda9f12
!145 记录操作日志
Merge pull request !145 from dxfeng/feature/dxf
3 years ago
dxfeng 2702b175cd 记录操作日志 3 years ago
dxfeng 8410a9d77f
!144 记录操作日志
Merge pull request !144 from dxfeng/feature/dxf
3 years ago
dxfeng cca52d7080 记录操作日志 3 years ago
dxfeng 5f779e9bc4
!143 记录操作日志
Merge pull request !143 from dxfeng/feature/dxf
3 years ago
dxfeng c139cd408a 记录操作日志 3 years ago
dxfeng 8c0c8ace55
!142 记录操作日志,岗位优化
Merge pull request !142 from dxfeng/feature/dxf
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 02608d5108 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 278194a4a3 记录操作日志,岗位优化 3 years ago
dxfeng 3923dab45b 记录操作日志 3 years ago
dxfeng f5d95fabb2 记录操作日志 3 years ago
dxfeng e85019a665
!140 操作日志
Merge pull request !140 from dxfeng/feature/dxf
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