 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 |
|
Chengliang
|
0c3322796f
|
solve conflict
|
2022-03-09 10:09:07 +08:00 |
|
Chengliang
|
a090937930
|
solove conflict
|
2022-03-09 10:00:51 +08:00 |
|
Chengliang
|
da98b66700
|
rebase
|
2022-03-09 09:58:39 +08:00 |
|
钱涛
|
880cf9ef66
|
excel导入导出
|
2022-03-09 09:58:36 +08:00 |
|
Chengliang
|
91958201e5
|
福利模块insert getForm delete update copy接口
|
2022-03-09 09:42:10 +08:00 |
|
钱涛
|
0e3412ad44
|
列表checkbox
|
2022-03-08 18:14:20 +08:00 |
|
钱涛
|
e860b30567
|
累计附加接口
|
2022-03-08 18:10:03 +08:00 |
|
钱涛
|
a190dc439d
|
日期转换
|
2022-03-08 16:35:05 +08:00 |
|
钱涛
|
9de0f08415
|
日期转换
|
2022-03-08 15:40:26 +08:00 |
|
钱涛
|
c8b05f5ef1
|
查询参数
|
2022-03-08 13:17:54 +08:00 |
|
Chengliang
|
2b61b030d7
|
福利模块getForm接口
|
2022-03-07 22:22:09 +08:00 |
|
钱涛
|
daee5b4c35
|
添加泛型
|
2022-03-07 19:34:02 +08:00 |
|
钱涛
|
382781fa26
|
列表注解
|
2022-03-07 19:27:32 +08:00 |
|
钱涛
|
0759628eb2
|
excel导入导出
|
2022-03-07 15:08:56 +08:00 |
|
钱涛
|
97cc5d154f
|
累计附加扣除-条件接口
|
2022-03-04 10:10:38 +08:00 |
|
钱涛
|
b028ad6845
|
税率修改接口bug
|
2022-03-03 14:52:50 +08:00 |
|
钱涛
|
c183a11cba
|
统一税率保存参数
|
2022-03-03 13:50:03 +08:00 |
|
钱涛
|
aa528eccd8
|
sql异常
|
2022-03-02 14:07:18 +08:00 |
MustangDeng
|
2bef264ce1
|
Merge branch 'master' of https://gitee.com/qlmr/weaver-hrm-salary
|
2022-03-02 11:12:41 +08:00 |
|
MustangDeng
|
d83d945c19
|
列表转化和选择框权限
|
2022-03-02 11:12:22 +08:00 |
|
钱涛
|
1e134de35b
|
税率表详细信息接口
|
2022-03-02 11:09:23 +08:00 |
|
钱涛
|
87d278448c
|
暂存税率表接口
|
2022-03-02 09:54:55 +08:00 |