 钱涛
|
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 |