 钱涛
|
84aa4caf54
|
解决冲突
|
2024-11-13 11:24:19 +08:00 |
|
钱涛
|
5a520a367a
|
Merge branch 'release/2.17.1.2411.01' into feature/权限
# Conflicts:
# resource/wiki/常用查询.md
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-11-13 11:10:27 +08:00 |
|
钱涛
|
158e7dd20c
|
Merge branch 'feature/次账号' into release/2.17.1.2411.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/sys/constant/SalarySysConstant.java
|
2024-11-12 18:05:42 +08:00 |
Harryxzy
|
5953c2b938
|
薪酬token加解密
|
2024-11-06 13:37:03 +08:00 |
|
Harryxzy
|
dbb332e07f
|
Merge branch 'release/2.16.1.2410.01' into fix/240901_token加解密
|
2024-11-06 10:05:53 +08:00 |
|
Harryxzy
|
07c0492ec2
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
|
2024-11-04 17:29:32 +08:00 |
|
钱涛
|
f884e3ff25
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
|
2024-10-25 16:04:43 +08:00 |
|
钱涛
|
71569cad9e
|
薪资所属年变量
|
2024-10-25 16:01:45 +08:00 |
|
钱涛
|
94bb1ede32
|
Merge branch 'release/2.16.1.2410.01' into feature/次账号
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-24 10:34:56 +08:00 |
|
钱涛
|
77d8c8168c
|
Merge branch 'release/2.16.1.2410.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2024-10-22 17:10:47 +08:00 |
|
钱涛
|
8c5c3d5949
|
工资单查看限制类型约束
|
2024-10-22 15:00:19 +08:00 |
|
钱涛
|
53ce7c7b43
|
核算人员显示次账号
|
2024-10-16 15:25:48 +08:00 |
|
Harryxzy
|
3420c36448
|
人员id加密
|
2024-09-18 18:10:30 +08:00 |
|
钱涛
|
383562c9cf
|
工资单、数据采集权限功能
|
2024-09-12 11:50:18 +08:00 |
|
钱涛
|
a0fb036bce
|
业务线配置
|
2024-09-09 19:10:40 +08:00 |
|
钱涛
|
4b0eee4798
|
工资单跨扣缴义务人发放
|
2024-09-04 15:39:54 +08:00 |
|
钱涛
|
0b90f4890e
|
工资单支持跨扣缴义务人
|
2024-09-03 14:30:57 +08:00 |
|
钱涛
|
c5c469e4c4
|
修复邮件不显示入职日期
|
2024-08-15 11:54:18 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +08:00 |
|
钱涛
|
64e34d6d08
|
工资单预览
|
2024-06-13 17:46:37 +08:00 |
|
钱涛
|
f073f6d90c
|
处理刷新非正常人员问题
|
2024-06-11 15:48:07 +08:00 |
|
钱涛
|
7952e93d01
|
考勤引用显示证件号码
|
2024-05-29 16:53:51 +08:00 |
|
钱涛
|
238438897b
|
处理工资单证件号码不显示
|
2024-05-29 14:04:16 +08:00 |
|
钱涛
|
43db025d98
|
Merge branch 'feature/账套副本' into release/2.14.2.2405.02
|
2024-05-23 11:36:38 +08:00 |
|
钱涛
|
3b9981e189
|
处理短信发送空值
|
2024-05-14 15:18:32 +08:00 |
|
Harryxzy
|
509257b419
|
pdf导出前先校验生成pdf
|
2024-05-11 15:07:54 +08:00 |
|
Harryxzy
|
1c1a77d387
|
移动端工资单列表返回登陆人id
|
2024-05-10 15:41:40 +08:00 |
|
钱涛
|
1cb89a9d1b
|
账套快照-工资单模板
|
2024-05-06 17:41:39 +08:00 |
|
Harryxzy
|
44ed332ed5
|
修复ecology的多语言导致乱码
|
2024-04-08 17:57:59 +08:00 |
|
Harryxzy
|
18c496c009
|
多部门多分部筛选
|
2024-03-21 14:19:36 +08:00 |
|
Harryxzy
|
0c444acd38
|
多部门多分部筛选
|
2024-03-21 14:19:03 +08:00 |
|
Harryxzy
|
b5afaa54df
|
Merge branch 'release/3.0.0.2403.01' into feature/240301_阅后即焚
|
2024-03-12 15:13:34 +08:00 |
|
钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
78d4f5e2ae
|
阅后即焚
|
2024-03-11 10:35:56 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
Harryxzy
|
7fe03ac7a1
|
工资单确认反馈优化
|
2024-02-19 10:09:49 +08:00 |
|
Harryxzy
|
e75cfae309
|
Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01
|
2024-01-31 16:13:27 +08:00 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
Harryxzy
|
12f66512df
|
工资单反馈区分pc和移动端
|
2024-01-30 13:50:05 +08:00 |
sy
|
f215b45afa
|
薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造
|
2024-01-26 10:04:53 +08:00 |
|
sy
|
8eeb358dcc
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
|
2024-01-25 11:41:44 +08:00 |
|
sy
|
4da07b9e80
|
薪酬系统-福利档案、台账，基数调整记录列表查询增加分权，台账查询条件支持个税扣缴义务人多选
|
2024-01-24 14:35:55 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
sy
|
94d72cd93c
|
薪酬系统-工资单模板，复制功能改造
|
2024-01-23 10:52:53 +08:00 |
|
钱涛
|
6ee8b5f044
|
解决短信不换行问题
|
2024-01-22 15:41:38 +08:00 |
|
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
|
钱涛
|
a143b4fba5
|
新增工资单模板短信字段
|
2023-11-23 09:31:09 +08:00 |