 钱涛
|
26bbc9c0ee
|
Merge branch 'release/2.9.6.2310.01' into release/个税版本
# Conflicts:
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
|
2023-10-08 14:21:25 +08:00 |
|
钱涛
|
6e889ccc70
|
同步字段名称到项目公式
|
2023-09-27 17:17:56 +08:00 |
|
钱涛
|
0545c6eb8c
|
Merge branch 'release/2.9.5.2309.01' into release/个税版本
|
2023-09-21 16:58:15 +08:00 |
Harryxzy
|
2934a88cc2
|
同步薪资项目至账套
|
2023-08-31 10:23:14 +08:00 |
|
Harryxzy
|
190bbe0875
|
同步薪资项目至账套
|
2023-08-31 09:24:41 +08:00 |
|
钱涛
|
988139610b
|
Merge branch 'release/2.9.4.2308.02' into release/230803对接个税
# Conflicts:
# src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
# src/com/engine/salary/web/SalarySobController.java
|
2023-08-18 09:36:26 +08:00 |
|
钱涛
|
dc63897165
|
个税对接，个税申报接口
|
2023-08-11 14:20:14 +08:00 |
|
Harryxzy
|
0a7c975c28
|
薪资账套-薪资项目编辑
|
2023-07-28 09:48:27 +08:00 |
|
Harryxzy
|
faf9636a0d
|
薪资项目-核算时隐藏 temp
|
2023-07-14 11:34:53 +08:00 |
|
Harryxzy
|
5918de016e
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
|
2023-07-11 13:24:37 +08:00 |
|
Harryxzy
|
fa950fb4dd
|
薪资项目排序比较
|
2023-07-11 13:23:07 +08:00 |
|
钱涛
|
bb6cf386cb
|
修复
|
2023-07-11 11:05:35 +08:00 |
|
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
|
钱涛
|
ec90e31695
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-05-24 16:20:39 +08:00 |
|
钱涛
|
404db31695
|
薪资项目系统项目排序靠后
|
2023-05-17 16:57:37 +08:00 |
|
钱涛
|
8228fbf21c
|
短信邮件
|
2023-05-08 09:27:20 +08:00 |
|
钱涛
|
cb484b8ff9
|
回算项公式使用不可删除
|
2023-02-21 17:19:32 +08:00 |
|
钱涛
|
eac70e7cde
|
薪资项目和社保福利方案分权
|
2023-02-21 17:02:39 +08:00 |
|
钱涛
|
187e60ec15
|
薪资项目分权
|
2023-02-21 16:39:17 +08:00 |
|
钱涛
|
77cff0ba24
|
档案字段被公式引用不允许删除
|
2023-02-17 18:03:46 +08:00 |
|
钱涛
|
bccdd07ba0
|
修改名称对应修改公式
|
2023-02-17 17:52:29 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
钱涛
|
abeb4d891d
|
薪资项目删除校验
|
2023-02-17 14:37:59 +08:00 |
|
钱涛
|
da9b548480
|
公式
|
2023-02-17 10:54:18 +08:00 |
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
fcli
|
f1bdd0ada9
|
feat: 薪资项目分权，修改落库
|
2023-01-12 14:19:46 +08:00 |
|
fcli
|
90b2edb96c
|
feat: 薪资项目分权代码合并
|
2023-01-12 14:19:39 +08:00 |
|
钱涛
|
c852211b0e
|
核算log
|
2022-05-07 15:20:39 +08:00 |
|
钱涛
|
7d440ce005
|
薪资项目分页
|
2022-04-15 13:54:47 +08:00 |
|
钱涛
|
4167cb55ee
|
限制薪资项目的删除
|
2022-03-30 20:27:17 +08:00 |
|
钱涛
|
83e1cf2805
|
相对更新
|
2022-03-24 16:59:52 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
|
钱涛
|
f8d68fa7bc
|
分页
|
2022-03-21 09:33:21 +08:00 |
|
钱涛
|
5a7cc85e53
|
分页
|
2022-03-17 15:14:35 +08:00 |