liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,166 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

1166 Commits

Author SHA1 Message Date
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
 2022-06-17 11:51:48 +08:00
dxfeng 84adef0520 表结构更新 2022-06-17 11:48:32 +08:00
dxfeng e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
reset bb324ad8d1
!93 新增类型修改 
Merge pull request !93 from reset/feature/cl
 2022-06-17 02:41:20 +00:00
Chengliang b60a335a1c 新增类型修改 2022-06-17 10:39:52 +08:00
dxfeng 637eb5ada7
!92 数据返回格式修改 
Merge pull request !92 from dxfeng/feature/dxf
 2022-06-17 01:46:41 +00:00
dxfeng c8604a8e40 数据返回格式修改 2022-06-17 09:45:32 +08:00
dxfeng b6a030c8bf
!91 字段删除 移动分组 
Merge pull request !91 from dxfeng/feature/dxf
 2022-06-16 10:26:45 +00:00
dxfeng 9aebfbcecc 字段删除 移动分组 2022-06-16 18:26:12 +08:00
dxfeng 124756b0b7
!90 自定义字段列表接口 
Merge pull request !90 from dxfeng/feature/dxf
 2022-06-16 10:09:01 +00:00
dxfeng 3ba19c1b8d 代码合并 2022-06-16 18:08:06 +08:00
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
 2022-06-16 18:04:32 +08:00
reset a8faa21174
!89 子信息维护 
Merge pull request !89 from reset/feature/cl
 2022-06-16 09:58:53 +00:00
Chengliang 6d4448ec51 子信息维护 2022-06-16 17:57:03 +08:00
dxfeng 4d2a70ad5d 自定义字段列表接口 2022-06-16 17:53:48 +08:00
dxfeng 5fd7eb3498 JCL_FIELD_EXTENDGROUP 添加 show_order 2022-06-16 16:13:04 +08:00
dxfeng 08ca2e0c5d 自定义字段列表 2022-06-16 16:10:33 +08:00
dxfeng 456e2ecc59 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-16 14:20:22 +08:00
dxfeng 52c964f199 添加自定义字段接口 2022-06-16 14:19:54 +08:00
dxfeng 6c8a6c7f2c
!88 BUG修复 
Merge pull request !88 from dxfeng/feature/dxf
 2022-06-16 01:56:01 +00:00
dxfeng 57b29a2312 BUG修复 2022-06-16 09:55:07 +08:00
dxfeng 82b240bce9
!87 BUG修复 
Merge pull request !87 from dxfeng/feature/dxf
 2022-06-16 01:39:43 +00:00
dxfeng e588fb0c96 BUG修复 2022-06-16 09:37:36 +08:00
dxfeng d33f907052
!86 分组删除 新增自定义字段 
Merge pull request !86 from dxfeng/feature/dxf
 2022-06-15 10:14:52 +00:00
dxfeng 70de6bbbd7 处理代码冲突 2022-06-15 18:12:53 +08:00
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
 2022-06-15 18:09:26 +08:00
dxfeng 7c02e9bc61 分组删除 新增自定义字段 2022-06-15 18:03:01 +08:00
reset a44668f342
!85 新增title 
Merge pull request !85 from reset/feature/cl
 2022-06-15 09:59:27 +00:00
Chengliang 8564d29bf1 新增类型默认title 2022-06-15 17:56:29 +08:00
reset 67727b6eee
!84 新增编辑类型 
Merge pull request !84 from reset/feature/cl
 2022-06-15 09:19:18 +00:00
Chengliang f4f7038611 新增编辑类型 2022-06-15 17:17:34 +08:00
reset a3c4fd5c21
!83 11 
Merge pull request !83 from reset/feature/cl
 2022-06-15 03:43:07 +00:00
Chengliang 068c446765 solve conflict 2022-06-15 11:41:44 +08:00
Chengliang 032a363985 自定义页面树 2022-06-15 11:36:48 +08:00
dxfeng c8112bd701
!82 分组维护 新建分组 
Merge pull request !82 from dxfeng/feature/dxf
 2022-06-15 03:26:31 +00:00
dxfeng b4b54fa1e1 分组维护 新建分组 2022-06-15 11:25:23 +08:00
dxfeng 1c7b232172
!81 代码合并 
Merge pull request !81 from dxfeng/feature/dxf
 2022-06-14 10:04:22 +00:00
dxfeng d809107c48 代码合并 2022-06-14 18:03:35 +08:00
reset 07cb72c05c
!80 11 
Merge pull request !80 from reset/feature/cl
 2022-06-14 10:01:35 +00:00
Chengliang cde0608e02 自定义树页面修好 2022-06-14 18:00:51 +08:00
dxfeng 851e6d28fa
!79 细化分组、标题、名字表是否启用； 明细表按照上下级关系展示 
Merge pull request !79 from dxfeng/feature/dxf
 2022-06-14 09:59:26 +00:00
dxfeng 568c9411da 代码合并 2022-06-14 17:57:41 +08:00
dxfeng 079addd6c7 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
 2022-06-14 17:56:26 +08:00
dxfeng a7e5619097 细化分组、标题、名字表是否启用； 
明细表按照上下级关系展示。
 2022-06-14 17:53:49 +08:00
reset 6e7c76ac0d
!78 自定义设置页面树 
Merge pull request !78 from reset/feature/cl
 2022-06-14 08:11:40 +00:00
Chengliang 6b1ce95b48 自定义设置页面树 2022-06-14 16:10:26 +08:00
dxfeng 9259596e54 自定义字段 getTabInfo 2022-06-14 15:29:22 +08:00
dxfeng e9947aeb46
!77 添加字段分组表 
Merge pull request !77 from dxfeng/feature/dxf
 2022-06-14 06:32:41 +00:00
dxfeng 5b0864d503 添加字段分组表 2022-06-14 14:31:52 +08:00