 钱涛
|
1a49dd331d
|
考勤字段相关接口
|
2022-03-15 14:18:04 +08:00 |
|
钱涛
|
eb4ca765d7
|
考勤相关接口
|
2022-03-15 09:55:58 +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 |
|
钱涛
|
3a09014291
|
bug
|
2022-03-11 19:00:58 +08:00 |
|
钱涛
|
2ce8d8ca5d
|
Merge branch 'feature/qt' into develop
|
2022-03-11 18:14:35 +08:00 |
|
钱涛
|
502450baab
|
bug
|
2022-03-11 18:14:19 +08:00 |
 reset
|
7c30485b88
|
!3 bug修复
Merge pull request !3 from reset/archive
|
2022-03-11 10:06:47 +00:00 |
|
Chengliang
|
99c9ad807f
|
福利方案bug修复
|
2022-03-11 17:46:26 +08:00 |
|
钱涛
|
5c1adf9774
|
Merge branch 'feature/qt' into develop
|
2022-03-11 17:27:34 +08:00 |
|
钱涛
|
298d432152
|
预览
|
2022-03-11 17:27:15 +08:00 |
|
钱涛
|
dded82ac7c
|
Merge branch 'feature/qt' into develop
|
2022-03-11 17:15:43 +08:00 |
|
钱涛
|
7f3b381e5c
|
导出过滤
|
2022-03-11 17:15:33 +08:00 |
|
钱涛
|
07979a5c00
|
Merge branch 'feature/qt' into develop
|
2022-03-11 16:29:47 +08:00 |
|
钱涛
|
cae1b1062e
|
申报月份
|
2022-03-11 16:28:37 +08:00 |
|
钱涛
|
333af1c924
|
Merge remote-tracking branch 'origin/feature/qt' into develop
|
2022-03-11 16:20:05 +08:00 |
|
钱涛
|
1c46bd28f7
|
累计bug
|
2022-03-11 16:19:47 +08:00 |
|
钱涛
|
9c8238d218
|
Merge branch 'feature/qt' into develop
|
2022-03-11 15:47:35 +08:00 |
|
钱涛
|
692a57ae63
|
累计bug
|
2022-03-11 15:47:08 +08:00 |
|
钱涛
|
1a7478ff57
|
Merge branch 'feature/qt' into develop
|
2022-03-11 15:15:14 +08:00 |
|
钱涛
|
822f9d4289
|
删除本地代码
|
2022-03-11 15:14:32 +08:00 |
|
Chengliang
|
c4e63e101b
|
表增加自增
|
2022-03-11 14:33:35 +08:00 |
|
Chengliang
|
0474872ab5
|
Merge branch 'develop' of https://gitee.com/qlmr/weaver-hrm-salary into develop
|
2022-03-11 14:29:08 +08:00 |
|
Chengliang
|
f09c6d197c
|
福利台账listPage
|
2022-03-11 14:28:39 +08:00 |
|
钱涛
|
8aabe78182
|
Merge branch 'feature/qt' into develop
|
2022-03-11 13:45:03 +08:00 |
|
钱涛
|
d748f3733a
|
累计bug
|
2022-03-11 13:44:47 +08:00 |
|
钱涛
|
2ba52fe82b
|
Merge remote-tracking branch 'origin/feature/qt' into develop
|
2022-03-11 13:20:17 +08:00 |
|
钱涛
|
4a15c5614b
|
累计bug
|
2022-03-11 13:20:00 +08:00 |
|
钱涛
|
d601f2fd59
|
Merge branch 'feature/qt' into develop
|
2022-03-11 11:09:16 +08:00 |
|
钱涛
|
9676102894
|
累计bug
|
2022-03-11 11:08:50 +08:00 |
|
钱涛
|
3f32fa98d6
|
累计实体错误
|
2022-03-11 10:18:30 +08:00 |
|
钱涛
|
934e9b1729
|
Merge branch 'feature/qt' into develop
|
2022-03-11 10:06:47 +08:00 |
|
钱涛
|
92fc902fba
|
明细表加checkbox
|
2022-03-11 10:06:13 +08:00 |
|
钱涛
|
628253ed0c
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/init.sql
|
2022-03-10 19:02:28 +08:00 |
|
钱涛
|
882665ff09
|
明细表加checkbox
|
2022-03-10 19:01:58 +08:00 |
|
Chengliang
|
843900882b
|
listPage
|
2022-03-10 18:24:08 +08:00 |
|
钱涛
|
e3c602a8a0
|
Merge branch 'feature/qt' into develop
|
2022-03-10 18:00:21 +08:00 |
|
钱涛
|
98c49db986
|
其他扣除项接口
|
2022-03-10 17:57:46 +08:00 |
|
Chengliang
|
0957528179
|
更新自定义福利状态接口
|
2022-03-10 15:26:09 +08:00 |
|
Chengliang
|
04cf94e498
|
自定义福利接口 getCustomCategoryForm createSICategory....
|
2022-03-10 15:23:56 +08:00 |
|
钱涛
|
784f58533a
|
导出明细
|
2022-03-10 11:12:13 +08:00 |
|
钱涛
|
8a7251c076
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/web/AddUpDeductionController.java
|
2022-03-10 11:10:40 +08:00 |
|
钱涛
|
d55fca8eeb
|
导出明细
|
2022-03-10 11:09:08 +08:00 |
|
钱涛
|
8da28ec05f
|
Merge branch 'feature/qt' into develop
# Conflicts:
# src/com/engine/salary/init.sql
|
2022-03-09 19:00:21 +08:00 |
|
钱涛
|
1319543251
|
累计接口
|
2022-03-09 18:58:30 +08:00 |
|
Chengliang
|
5cb2f02e69
|
福利方案修复更新操作
|
2022-03-09 17:46:03 +08:00 |
|
Chengliang
|
927b25908e
|
solve conflict
|
2022-03-09 17:02:36 +08:00 |
|
钱涛
|
7ee952e63c
|
累计
|
2022-03-09 16:40:14 +08:00 |
|
Chengliang
|
7d245e786e
|
社保自定义福利控制器 getForm
|
2022-03-09 16:12:47 +08:00 |