 reset
|
df5fa147e1
|
!28 修复xml报错
Merge pull request !28 from reset/archive
|
2022-04-22 08:43:04 +00:00 |
|
Chengliang
|
9dc29b2b3c
|
修复xml文件报错
|
2022-04-22 16:42:06 +08:00 |
 钱涛
|
5347c70809
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-22 15:46:14 +08:00 |
|
钱涛
|
6b76829b39
|
考勤接口
|
2022-04-22 15:46:03 +08:00 |
|
reset
|
ef4ffacbcc
|
!27 修复方案列表
Merge pull request !27 from reset/archive
|
2022-04-22 07:19:56 +00:00 |
|
Chengliang
|
c2c7d2dee5
|
修复方案列表
|
2022-04-22 15:17:31 +08:00 |
|
钱涛
|
afb65fced8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-22 15:02:34 +08:00 |
|
钱涛
|
bb418ff6b6
|
title
|
2022-04-22 15:02:24 +08:00 |
MustangDeng
|
ee9116ae2b
|
工资单列表问题处理
|
2022-04-22 11:02:15 +08:00 |
|
钱涛
|
3c03d7144d
|
删除bug
|
2022-04-21 20:36:04 +08:00 |
|
钱涛
|
a20198fc4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-21 20:29:25 +08:00 |
|
钱涛
|
cd8df85e54
|
公式字段
|
2022-04-21 20:29:11 +08:00 |
|
MustangDeng
|
c327aafd6c
|
Merge branch 'feature/salaryBill' into develop
|
2022-04-21 16:45:33 +08:00 |
|
MustangDeng
|
3003d0fadb
|
生成工资单
|
2022-04-21 16:45:03 +08:00 |
|
MustangDeng
|
2f2b48b172
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-21 15:45:58 +08:00 |
|
MustangDeng
|
a93949e8c5
|
Merge branch 'feature/salaryBill' into develop
# Conflicts:
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
|
2022-04-21 15:42:47 +08:00 |
|
reset
|
926b132d50
|
!26 导出
Merge pull request !26 from reset/archive
|
2022-04-21 07:05:43 +00:00 |
|
Chengliang
|
d0f12c2faf
|
6个列表页导出完成
|
2022-04-21 15:04:35 +08:00 |
|
MustangDeng
|
38179daee9
|
我的工资单
|
2022-04-21 14:46:45 +08:00 |
|
钱涛
|
36d65de007
|
fix
|
2022-04-21 14:15:56 +08:00 |
|
MustangDeng
|
d0425fc387
|
福利档案-批量保存
|
2022-04-21 14:08:18 +08:00 |
18895359881@163.com
|
21e4afcbbb
|
Merge branch 'test_xxy' into develop
|
2022-04-20 21:37:39 +08:00 |
|
18895359881@163.com
|
d15cccca8d
|
申报表生成
|
2022-04-20 21:36:27 +08:00 |
|
钱涛
|
a0957ecd7b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-20 19:23:25 +08:00 |
|
钱涛
|
343cc1ad26
|
档案导入
|
2022-04-20 19:23:16 +08:00 |
|
reset
|
5320e0b4f8
|
!25 福利台账
Merge pull request !25 from reset/archive
|
2022-04-20 11:14:23 +00:00 |
|
Chengliang
|
72e9e152d6
|
福利台账相关
|
2022-04-20 19:12:01 +08:00 |
|
18895359881@163.com
|
e66defc3a2
|
身份类型
|
2022-04-20 16:45:59 +08:00 |
|
18895359881@163.com
|
5b90c0524f
|
身份类型
|
2022-04-20 16:45:09 +08:00 |
|
18895359881@163.com
|
c5ac683981
|
Merge branch 'test_xxy' into develop
|
2022-04-20 16:03:41 +08:00 |
|
18895359881@163.com
|
ad3af977ab
|
申报表导出完善
|
2022-04-20 16:02:52 +08:00 |
|
钱涛
|
d2ba2c3afe
|
公式参数
|
2022-04-20 11:31:55 +08:00 |
|
钱涛
|
643160e714
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-20 11:17:34 +08:00 |
|
钱涛
|
7882048217
|
公式
|
2022-04-20 11:17:25 +08:00 |
|
18895359881@163.com
|
4fd63c1999
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-19 20:59:33 +08:00 |
|
18895359881@163.com
|
bfdb9a33d5
|
个税申报表接口
|
2022-04-19 20:58:30 +08:00 |
|
钱涛
|
cb30e24e95
|
公式
|
2022-04-19 20:33:06 +08:00 |
|
钱涛
|
b1b086caf1
|
预览
|
2022-04-19 19:50:00 +08:00 |
|
钱涛
|
ccd4768a0e
|
线下对比导入
|
2022-04-19 19:34:57 +08:00 |
|
钱涛
|
72b52de3aa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-19 19:32:34 +08:00 |
|
钱涛
|
dc008dad5c
|
核算导入
|
2022-04-19 19:32:09 +08:00 |
|
reset
|
24a20e14d0
|
!24 福利台账导出及列表bug修
Merge pull request !24 from reset/archive
|
2022-04-19 09:47:11 +00:00 |
|
Chengliang
|
bef9b30a2e
|
福利台账导出及列表bug修复
|
2022-04-19 17:46:24 +08:00 |
|
reset
|
6be53605d5
|
!23 福利台账导出及列表bug修
Merge pull request !23 from reset/archive
|
2022-04-19 09:45:08 +00:00 |
|
钱涛
|
c2cbdce9ec
|
补充列
|
2022-04-19 17:21:27 +08:00 |
|
钱涛
|
c4c757d055
|
Merge branch 'feature/v1' into develop
|
2022-04-19 15:13:23 +08:00 |
|
钱涛
|
c537b7d944
|
补充列
|
2022-04-19 15:13:08 +08:00 |
|
钱涛
|
e16a533089
|
补充列
|
2022-04-19 13:42:16 +08:00 |
|
Chengliang
|
0feadcf0b2
|
1
|
2022-04-19 13:32:11 +08:00 |
|
钱涛
|
2afab36ee7
|
补充列
|
2022-04-19 13:30:41 +08:00 |