 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 |
|
MustangDeng
|
e672961dc2
|
账套-薪资项目设置，人员基本信息下拉框数据修改
|
2022-04-13 11:03:27 +08:00 |
|
MustangDeng
|
b8ac967ed1
|
工资单发放-BeanUtil导包问题
|
2022-04-13 10:33:56 +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 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |
|
钱涛
|
4d674bdd37
|
Merge branch 'feature/acc' into develop
|
2022-04-11 20:46:44 +08:00 |
|
钱涛
|
43d97d87b3
|
核算基础公式
|
2022-04-11 20:46:25 +08:00 |
|
钱涛
|
a069447f02
|
核算基础公式
|
2022-04-11 20:17:47 +08:00 |
|
Chengliang
|
568cc1811e
|
薪资台账列表
|
2022-04-11 19:07:35 +08:00 |
|
MustangDeng
|
1573abd1ee
|
Revert "工资单发放-todo"
This reverts commit b850f5ad
|
2022-04-11 14:30:30 +08:00 |
|
MustangDeng
|
31acdbb606
|
Merge branch 'feature/djp' into develop
|
2022-04-11 14:29:25 +08:00 |
|
MustangDeng
|
b850f5ad8d
|
工资单发放-todo
|
2022-04-11 14:28:45 +08:00 |
|
钱涛
|
0b72b2e6cb
|
核算v2
|
2022-04-08 19:08:59 +08:00 |
|
钱涛
|
23adb455fd
|
核算v1
|
2022-04-08 16:30:10 +08:00 |
|
钱涛
|
70f3239e98
|
查询条件
|
2022-04-07 20:05:58 +08:00 |
|
钱涛
|
61a8605f5a
|
fix
|
2022-04-07 18:41:40 +08:00 |
|
钱涛
|
0dedda4dbd
|
核算
|
2022-04-07 16:54:10 +08:00 |
|
钱涛
|
caf83c6386
|
fix
|
2022-04-07 14:19:06 +08:00 |
|
钱涛
|
76eca07701
|
fix
|
2022-04-07 13:51:26 +08:00 |
|
钱涛
|
90335032fd
|
调整原因
|
2022-04-07 11:39:22 +08:00 |
|
钱涛
|
0fd2ddf78c
|
Merge branch 'develop' into feature/qt
|
2022-04-07 09:59:14 +08:00 |
|
钱涛
|
0faa5c5670
|
删除测试代码
|
2022-04-07 09:59:02 +08:00 |
|
钱涛
|
c1bcff5fb2
|
Merge branch 'feature/qt' into develop
|
2022-04-07 09:54:25 +08:00 |
|
钱涛
|
0735bdf99b
|
记录表头
|
2022-04-07 09:50:30 +08:00 |
|
钱涛
|
91b7a8ffc6
|
Merge branch 'feature/qt' into develop
|
2022-04-06 20:01:14 +08:00 |
|
钱涛
|
9d223c7a06
|
核算基础类
|
2022-04-06 20:01:00 +08:00 |
|
钱涛
|
9b7f1e69b3
|
Merge branch 'feature/qt' into develop
|
2022-04-06 13:23:20 +08:00 |
|
钱涛
|
75f64648d6
|
档案类修复
|
2022-04-06 13:21:30 +08:00 |
|
钱涛
|
8d9ff236f7
|
档案类修复
|
2022-04-06 11:02:02 +08:00 |
|
钱涛
|
56a167619b
|
Merge branch 'feature/qt' into develop
|
2022-04-02 16:57:35 +08:00 |
|
钱涛
|
1c38214f6f
|
薪资档案表单
|
2022-04-02 16:57:27 +08:00 |
|
钱涛
|
aa63a067b1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-02 15:34:56 +08:00 |
|
钱涛
|
3307c5c67e
|
薪资档案后续接口
|
2022-04-02 15:34:27 +08:00 |
|
钱涛
|
126444b9f3
|
薪资档案
|
2022-04-01 18:25:24 +08:00 |
|
MustangDeng
|
5534a4689a
|
Merge branch 'feature/djp' into develop
|
2022-04-01 15:06:45 +08:00 |
|
MustangDeng
|
3631a67ebf
|
福利方案列表公司,个人 显示
|
2022-04-01 15:06:14 +08:00 |
|
钱涛
|
77229d18a0
|
列表
|
2022-04-01 14:13:04 +08:00 |
|
钱涛
|
63e414e5d7
|
Merge branch 'develop' into feature/qt
# Conflicts:
# src/com/engine/salary/enums/UserStatusEnum.java
|
2022-04-01 13:54:27 +08:00 |
|
钱涛
|
f95d8a7d0d
|
暂存
|
2022-04-01 13:50:24 +08:00 |
|
钱涛
|
036b6fea96
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-04-01 10:26:55 +08:00 |
|
钱涛
|
c03078cb12
|
Merge branch 'feature/qt' into develop
|
2022-04-01 10:26:44 +08:00 |
|
钱涛
|
8326f3ae6f
|
导入参数
|
2022-04-01 10:26:28 +08:00 |
|
MustangDeng
|
266745c241
|
Merge branch 'feature/djp' into develop
|
2022-04-01 09:21:19 +08:00 |
|
MustangDeng
|
e5100c8f44
|
福利方案列表
|
2022-04-01 09:20:44 +08:00 |
|
钱涛
|
e8de53d51f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-31 18:42:23 +08:00 |
|
钱涛
|
e9e03880d9
|
Merge branch 'feature/qt' into develop
|
2022-03-31 18:42:06 +08:00 |
|
钱涛
|
163963d463
|
fix bug
|
2022-03-31 18:41:41 +08:00 |
|
钱涛
|
a8732708a8
|
薪资档案导入
|
2022-03-31 15:41:55 +08:00 |
|
MustangDeng
|
13b69c76eb
|
档案列表快捷搜索
|
2022-03-31 14:22:42 +08:00 |
|
MustangDeng
|
b10c09f0c4
|
档案列表列表问题
|
2022-03-31 13:41:40 +08:00 |
|
钱涛
|
cd6ad5f4be
|
Merge branch 'feature/qt' into develop
|
2022-03-30 20:27:33 +08:00 |
|
钱涛
|
4167cb55ee
|
限制薪资项目的删除
|
2022-03-30 20:27:17 +08:00 |
|
钱涛
|
b30bcb8453
|
Merge branch 'feature/qt' into develop
|
2022-03-30 18:32:55 +08:00 |
|
钱涛
|
93686e38c5
|
bug
|
2022-03-30 18:32:44 +08:00 |
|
钱涛
|
fbfb5f5005
|
Merge branch 'feature/qt' into develop
|
2022-03-30 18:01:07 +08:00 |
|
钱涛
|
922a055f97
|
统一sql
|
2022-03-30 18:00:56 +08:00 |
|
钱涛
|
b573118641
|
Merge branch 'feature/qt' into develop
|
2022-03-30 15:58:40 +08:00 |
|
钱涛
|
d6ed96e891
|
sql修改
|
2022-03-30 15:58:29 +08:00 |
|
钱涛
|
94bef09608
|
Merge branch 'feature/qt' into develop
|
2022-03-30 14:56:45 +08:00 |
|
钱涛
|
6d61297dd1
|
sql修改
|
2022-03-30 14:56:31 +08:00 |
|
钱涛
|
50a62e3b29
|
Merge branch 'feature/qt' into develop
|
2022-03-30 12:16:07 +08:00 |
|
钱涛
|
a3604a28f0
|
校驗規則列表
|
2022-03-30 12:15:49 +08:00 |
|
钱涛
|
f8a704e66c
|
修改sql
|
2022-03-30 11:29:48 +08:00 |
|
钱涛
|
cf39049530
|
Merge branch 'feature/qt' into develop
|
2022-03-29 17:11:15 +08:00 |
|
钱涛
|
5c550365f1
|
薪资档案
|
2022-03-29 17:10:59 +08:00 |
|
钱涛
|
2a5a72f6ab
|
Merge branch 'feature/qt' into develop
|
2022-03-28 20:04:51 +08:00 |
|
钱涛
|
ba707878fc
|
薪资档案
|
2022-03-28 20:04:27 +08:00 |
|
钱涛
|
019cdd9968
|
Merge branch 'feature/qt' into develop
|
2022-03-28 16:37:03 +08:00 |
|
钱涛
|
5ae4eb5fc8
|
项目id
|
2022-03-28 16:36:40 +08:00 |
|
钱涛
|
dc6ebdb4df
|
Merge branch 'feature/qt' into develop
|
2022-03-28 13:48:55 +08:00 |
|
钱涛
|
93154ada71
|
薪资账套项目保存
|
2022-03-28 13:48:43 +08:00 |
|
钱涛
|
faca2d4d1b
|
Merge branch 'feature/qt' into develop
|
2022-03-28 11:38:46 +08:00 |
|
钱涛
|
045293426c
|
账套校验规则
|
2022-03-28 11:38:33 +08:00 |
|
钱涛
|
00c0fe477e
|
税率
|
2022-03-28 10:49:23 +08:00 |
|
钱涛
|
c9281bd6db
|
Merge branch 'feature/qt' into develop
|
2022-03-25 18:05:18 +08:00 |
|
钱涛
|
1db71a97ff
|
薪资账套
|
2022-03-25 18:05:07 +08:00 |
|
钱涛
|
cc233e82a5
|
Merge branch 'feature/qt' into develop
|
2022-03-25 10:46:05 +08:00 |
|
钱涛
|
24c50f7f17
|
名称模糊查询
|
2022-03-25 10:45:53 +08:00 |
|
钱涛
|
cc13dd5c7b
|
Merge branch 'feature/qt' into develop
|
2022-03-25 10:31:45 +08:00 |
|
钱涛
|
980415c8ca
|
账套
|
2022-03-25 10:31:31 +08:00 |
|
钱涛
|
c4142801bc
|
Merge branch 'feature/qt' into develop
|
2022-03-24 20:01:56 +08:00 |
|
钱涛
|
f2cf03ebbf
|
departmentIds
|
2022-03-24 20:01:25 +08:00 |
|
钱涛
|
5ad46ffabd
|
Merge branch 'feature/qt' into develop
|
2022-03-24 19:42:11 +08:00 |
|
钱涛
|
a9d486bef6
|
相对更新
|
2022-03-24 19:42:03 +08:00 |
|
钱涛
|
48f1497f96
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-03-24 17:00:19 +08:00 |
|
钱涛
|
466966dac6
|
Merge branch 'feature/qt' into develop
|
2022-03-24 17:00:08 +08:00 |
|
钱涛
|
83e1cf2805
|
相对更新
|
2022-03-24 16:59:52 +08:00 |
|
reset
|
8df72164cc
|
!13 福利方案高级搜索接口
Merge pull request !13 from reset/archive
|
2022-03-23 13:07:37 +00:00 |
|
Chengliang
|
d82e3e9e6f
|
福利方按高级搜索接口
|
2022-03-23 21:05:01 +08:00 |
|
钱涛
|
288c274aaf
|
Merge branch 'feature/qt' into develop
|
2022-03-23 20:54:22 +08:00 |