 钱涛
|
b1b086caf1
|
预览
|
2022-04-19 19:50:00 +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 |
|
Chengliang
|
0feadcf0b2
|
1
|
2022-04-19 13:32:11 +08:00 |
|
reset
|
37830fc89e
|
!22 增加datakey
Merge pull request !22 from reset/archive
|
2022-04-19 04:20:18 +00:00 |
|
Chengliang
|
9c02c9c9fd
|
列表增加datakey
|
2022-04-19 12:19:06 +08:00 |
|
reset
|
8ed7bbb3b6
|
!21 福利台账导出各接口
Merge pull request !21 from reset/archive
|
2022-04-18 12:26:02 +00:00 |
|
Chengliang
|
651df1842e
|
福利台账导出
|
2022-04-18 20:24:43 +08:00 |
18895359881@163.com
|
cd41ca92c7
|
Merge branch 'test_xxy' into develop
|
2022-04-18 19:53:52 +08:00 |
|
18895359881@163.com
|
6fce8cdf4c
|
薪酬接口
|
2022-04-18 18:56:17 +08:00 |
|
钱涛
|
3bfdef7966
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-18 17:28:49 +08:00 |
|
钱涛
|
91da4ab831
|
自定义按钮
|
2022-04-18 17:28:34 +08:00 |
|
reset
|
11f0354d3a
|
!20 合并
Merge pull request !20 from reset/archive
|
2022-04-18 09:16:30 +00:00 |
|
钱涛
|
38a4c524f3
|
公式
|
2022-04-18 15:38:27 +08:00 |
|
钱涛
|
dcec31bf06
|
Merge branch 'feature/acctV2' into develop
|
2022-04-18 15:24:47 +08:00 |
|
钱涛
|
bbcb5916ce
|
公式更换jar
|
2022-04-18 14:45:12 +08:00 |
MustangDeng
|
fee9a35b42
|
Merge branch 'feature/salaryBill' into develop
|
2022-04-18 09:20:00 +08:00 |
|
钱涛
|
7fbe29b36a
|
Merge branch 'feature/acctV2' into develop
|
2022-04-16 16:49:57 +08:00 |
|
钱涛
|
50d502632f
|
公式
|
2022-04-16 16:49:22 +08:00 |
|
Chengliang
|
2d98890c04
|
台账相关列表
|
2022-04-16 16:43:33 +08:00 |
|
18895359881@163.com
|
a5b73098c9
|
Merge branch 'develop' into test_xxy
|
2022-04-16 16:14:56 +08:00 |
|
18895359881@163.com
|
3e64b1cfde
|
薪酬接口
|
2022-04-16 15:33:51 +08:00 |
|
reset
|
ed096261d3
|
!19 福利台账相关接口
Merge pull request !19 from reset/archive
|
2022-04-15 11:02:47 +00:00 |
|
Chengliang
|
9813012249
|
福利台账相关接口
|
2022-04-15 19:01:09 +08:00 |
|
钱涛
|
fa5f8b7da0
|
Merge branch 'feature/acctV2' into develop
|
2022-04-15 13:55:16 +08:00 |
|
钱涛
|
7d440ce005
|
薪资项目分页
|
2022-04-15 13:54:47 +08:00 |
|
reset
|
5cb511bdc1
|
!18 社保档案详情-保存等接口
Merge pull request !18 from reset/archive
|
2022-04-15 05:18:56 +00:00 |
|
Chengliang
|
6ddf60a548
|
福利台账核算接口
|
2022-04-15 13:17:25 +08:00 |
|
钱涛
|
941a34990f
|
Merge branch 'feature/acct' into develop
# Conflicts:
# src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
# src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
|
2022-04-14 20:49:24 +08:00 |
|
钱涛
|
4db39902b5
|
公式v2
|
2022-04-14 20:46:17 +08:00 |
|
MustangDeng
|
a739d746f7
|
工资单发放-测试
|
2022-04-14 19:32:09 +08:00 |
|
reset
|
23388ef017
|
!17 台账保存核算
Merge pull request !17 from reset/archive
|
2022-04-14 03:56:10 +00:00 |
|
Chengliang
|
2eadc713e1
|
薪资台账保存核算
|
2022-04-14 11:54:16 +08:00 |
|
钱涛
|
a4547db7ff
|
公式
|
2022-04-14 10:03:49 +08:00 |
|
MustangDeng
|
87ef976b7c
|
工资单发放-引包修改
|
2022-04-14 09:08:04 +08:00 |
|
钱涛
|
a2102a49b4
|
核算v3
|
2022-04-13 14:18:00 +08:00 |
|
MustangDeng
|
50c03b19e0
|
Merge branch 'develop' into feature/salaryBill
# Conflicts:
# src/com/engine/salary/annotation/SalaryFormulaVar.java
|
2022-04-13 11:09:41 +08:00 |
|
reset
|
ac86ad0d62
|
!16 台账
Merge pull request !16 from reset/archive
|
2022-04-12 11:31:07 +00:00 |
|
Chengliang
|
985456ed14
|
社保台账
|
2022-04-12 19:29:19 +08:00 |
|
钱涛
|
340fe4c38e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-12 19:25:29 +08:00 |
|
钱涛
|
692c2f5a79
|
核算
|
2022-04-12 19:25:19 +08:00 |
|
MustangDeng
|
897c98114f
|
工资单发放-工资单模板接口
|
2022-04-12 18:28:12 +08:00 |
|
reset
|
9b907a7a36
|
!15 福利台账
Merge pull request !15 from reset/archive
|
2022-04-12 02:25:50 +00:00 |
|
Chengliang
|
0dd6f4ae35
|
福利台账
|
2022-04-12 10:24:21 +08:00 |