 钱涛
|
288c274aaf
|
Merge branch 'feature/qt' into develop
|
2022-03-23 20:54:22 +08:00 |
|
钱涛
|
79f9e010af
|
账套薪资项目
|
2022-03-23 20:54:08 +08:00 |
|
钱涛
|
00150f1696
|
Merge branch 'feature/qt' into develop
|
2022-03-23 18:41:52 +08:00 |
|
钱涛
|
b3d7123401
|
列表添加id
|
2022-03-23 18:41:38 +08:00 |
|
钱涛
|
2c65022174
|
Merge branch 'feature/qt' into develop
|
2022-03-23 13:52:58 +08:00 |
|
钱涛
|
e66445ce20
|
人员sql
|
2022-03-23 13:52:43 +08:00 |
|
钱涛
|
578b8f7aaa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-23 09:26:33 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
 reset
|
24a5b0b48d
|
!12 福利档案接口
Merge pull request !12 from reset/archive
|
2022-03-22 11:48:54 +00:00 |
|
Chengliang
|
56036bf9cb
|
福利方案getSearchCondition接口
|
2022-03-22 19:47:46 +08:00 |
|
reset
|
0789b1c7a9
|
!11 福利档案getSearchCondition接口
Merge pull request !11 from reset/archive
|
2022-03-22 11:46:35 +00:00 |
|
Chengliang
|
b0982f7d7f
|
福利台账getSearch接口
|
2022-03-22 19:44:35 +08:00 |
|
钱涛
|
f94e64b492
|
Merge branch 'feature/qt' into develop
|
2022-03-22 10:42:47 +08:00 |
|
钱涛
|
0b3b971ecd
|
参数验证，运行期功能
|
2022-03-22 10:42:26 +08:00 |
|
钱涛
|
87d304d63e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-21 20:10:28 +08:00 |
|
钱涛
|
2f8b56e4ac
|
参数验证类
|
2022-03-21 20:09:10 +08:00 |
|
reset
|
7fa5f12f6e
|
!10 优化listpage接口
Merge pull request !10 from reset/archive
|
2022-03-21 08:14:47 +00:00 |
|
Chengliang
|
e9ee672a66
|
社保档案listPage优化
|
2022-03-21 16:13:08 +08:00 |
|
钱涛
|
994a1dbd16
|
分页
|
2022-03-21 10:08:39 +08:00 |
|
钱涛
|
f0a0680bdc
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/common/BaseQueryParam.java
# src/com/engine/salary/demo/DemoPageCmd.java
|
2022-03-21 09:36:56 +08:00 |
|
钱涛
|
dc567d9463
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/com/api/salary/web/DemoController.java
|
2022-03-21 09:35:11 +08:00 |
|
钱涛
|
d2ce25550e
|
demo
|
2022-03-21 09:34:30 +08:00 |
|
钱涛
|
f8d68fa7bc
|
分页
|
2022-03-21 09:33:21 +08:00 |
|
reset
|
620193471c
|
!9 社保档案动态列接口
Merge pull request !9 from reset/archive
|
2022-03-18 10:04:59 +00:00 |
|
Chengliang
|
19dd1eed17
|
社保档案动态列接口
|
2022-03-18 18:00:51 +08:00 |
|
钱涛
|
54925dc51e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-17 15:47:42 +08:00 |
|
钱涛
|
eaaf69b09c
|
Merge branch 'feature/qt' into develop
|
2022-03-17 15:47:31 +08:00 |
|
钱涛
|
5b0374ca42
|
分页
|
2022-03-17 15:47:14 +08:00 |
|
reset
|
4749bdbdc4
|
!8 社保档案详情-保存等接口
Merge pull request !8 from reset/archive
|
2022-03-17 07:28:29 +00:00 |
|
Chengliang
|
7194ae4026
|
社保档案详情-保存等接口
|
2022-03-17 15:26:33 +08:00 |
|
钱涛
|
a6bd9f38de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-17 15:15:00 +08:00 |
|
钱涛
|
2a6f3a10ce
|
Merge branch 'feature/qt' into develop
|
2022-03-17 15:14:53 +08:00 |
|
钱涛
|
5a7cc85e53
|
分页
|
2022-03-17 15:14:35 +08:00 |
|
reset
|
2c23c05dee
|
!7 批量保存，批量删除社保档案
Merge pull request !7 from reset/archive
|
2022-03-16 10:28:32 +00:00 |
|
Chengliang
|
cc9a650b92
|
批量保存，批量删除社保档案
|
2022-03-16 18:26:49 +08:00 |
|
reset
|
23519e2050
|
!6 payform 及表单组件
Merge pull request !6 from reset/archive
|
2022-03-16 09:06:09 +00:00 |
|
Chengliang
|
b0124e250d
|
福利档案payForm及表单组件
|
2022-03-16 17:04:21 +08:00 |
|
钱涛
|
59fc1ded4e
|
Merge branch 'feature/qt' into develop
|
2022-03-16 14:30:54 +08:00 |
|
钱涛
|
00bf811075
|
考勤导出接口
|
2022-03-16 14:29:02 +08:00 |
|
reset
|
112e8e9c32
|
福利档案获取baseForm
Merge pull request from reset/archive
|
2022-03-15 09:41:43 +00:00 |
|
Chengliang
|
88c0cc67e6
|
福利档案获取baseForm
|
2022-03-15 17:39:19 +08:00 |
|
钱涛
|
1a49dd331d
|
考勤字段相关接口
|
2022-03-15 14:18:04 +08:00 |
|
Chengliang
|
67fe45cd2a
|
bug修复
|
2022-03-15 09:56:56 +08:00 |
|
钱涛
|
27c9d669f7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-15 09:56:30 +08:00 |
|
钱涛
|
eb4ca765d7
|
考勤相关接口
|
2022-03-15 09:55:58 +08:00 |
|
reset
|
64eff51ab2
|
!4 福利方案表单接口
Merge pull request !4 from reset/archive
|
2022-03-15 01:39:24 +00:00 |
|
Chengliang
|
69a1b4d5ae
|
福利项目表单接口修复
|
2022-03-15 09:34:53 +08:00 |
|
钱涛
|
fe14008e39
|
sql适配
|
2022-03-12 17:45:39 +08:00 |
|
钱涛
|
4e9d103021
|
fix bug
|
2022-03-12 14:20:39 +08:00 |
|
钱涛
|
3abcf90ee2
|
连表查询
|
2022-03-12 13:21:27 +08:00 |