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 |
sy
|
8237ed48a6
|
Merge remote-tracking branch 'remotes/origin/feature/240101工资单模板复制优化及福利基数调整记录优化' into release/2.10.1.2401.01
|
2024-01-30 14:32:59 +08:00 |
|
Harryxzy
|
5e9956fbbf
|
修复新建工资单模板时没有模板id，导致添加薪资项目时取到了其他模板的重命名的信息。
|
2024-01-26 14:56:58 +08:00 |
|
sy
|
56c9557b3a
|
Merge remote-tracking branch 'remotes/origin/release/2.10.1.2401.01' into feature/240101工资单模板复制优化及福利基数调整记录优化
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-01-25 11:43:11 +08:00 |
|
sy
|
e92e134d21
|
薪酬系统-工资单模板，复制功能改造，补发工资单模板名称更改
|
2024-01-25 11:41:35 +08:00 |
 钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
sy
|
2a67ca9238
|
薪酬系统-工资单模板，复制功能改造2
|
2024-01-23 13:55:49 +08:00 |
|
sy
|
94d72cd93c
|
薪酬系统-工资单模板，复制功能改造
|
2024-01-23 10:52:53 +08:00 |
|
钱涛
|
afabde3b18
|
短信模板配置
|
2023-11-22 10:54:32 +08:00 |
|
钱涛
|
d2127cccff
|
短信模板
|
2023-11-15 13:32:37 +08:00 |
|
Harryxzy
|
2b08efb483
|
复制工资单模板时同时复制工资单展示名称信息
|
2023-07-31 14:13:07 +08:00 |
|
Harryxzy
|
b7203625c1
|
自定义工资项目展示名fix 添加
|
2023-07-31 10:47:00 +08:00 |
|
Harryxzy
|
ad6a571310
|
自定义工资项目展示名fix
|
2023-07-21 11:08:54 +08:00 |
|
Harryxzy
|
b95663ada8
|
自定义工资项目展示名
|
2023-07-20 10:42:16 +08:00 |
|
Harryxzy
|
6279f0d8c9
|
工资单反馈
|
2023-07-14 09:55:36 +08:00 |
|
Harryxzy
|
30d61e352f
|
工资单确认反馈
|
2023-07-13 11:50:02 +08:00 |
|
Harryxzy
|
938f03946b
|
Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01
|
2023-07-10 10:09:52 +08:00 |
|
Harryxzy
|
9b7ba19d64
|
Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01
|
2023-07-10 10:09:45 +08:00 |
|
Harryxzy
|
896e0c9e34
|
工资单定时发送 添加 发放周期
|
2023-07-05 09:59:45 +08:00 |
|
Harryxzy
|
c78839d8c0
|
工资单定时发送 添加 发放周期
|
2023-07-04 18:03:57 +08:00 |
|
Harryxzy
|
c8cf6090ff
|
系统薪资项目可配置删除、工资单模板默认没有隐藏项目
|
2023-07-04 13:21:19 +08:00 |
|
Harryxzy
|
8dc3883168
|
工资单定时发送
|
2023-07-03 17:46:11 +08:00 |
|
钱涛
|
1403b22cf7
|
修复邮件保存
|
2023-07-03 14:02:34 +08:00 |
|
Harryxzy
|
9842784297
|
工资单定时发送 - 模板保存
|
2023-06-30 15:58:55 +08:00 |
|
Harryxzy
|
0e601e3967
|
修改DBType的写法
|
2023-06-19 13:59:24 +08:00 |
|
Harryxzy
|
d9f041c9bb
|
账套删除前校验是否存在工资单模板
|
2023-04-07 16:06:47 +08:00 |
|
Harryxzy
|
f89c5d2970
|
工资单模板编辑补发模板
|
2022-12-07 15:03:39 +08:00 |
|
Harryxzy
|
c0d916c286
|
薪资回算功能，工资单部分
|
2022-12-06 15:29:08 +08:00 |
|
钱涛
|
e0a031e197
|
oracle异常
|
2022-08-18 15:02:04 +08:00 |
|
钱涛
|
dc27578ddf
|
社保福利分权1.0
|
2022-06-06 16:55:02 +08:00 |
MustangDeng
|
78234f7554
|
工资单默认模板
|
2022-05-24 10:24:17 +08:00 |
|
MustangDeng
|
897c98114f
|
工资单发放-工资单模板接口
|
2022-04-12 18:28:12 +08:00 |
|
MustangDeng
|
bd8305763e
|
工资单发放-编译
|
2022-04-12 10:11:53 +08:00 |
|
MustangDeng
|
1573abd1ee
|
Revert "工资单发放-todo"
This reverts commit b850f5ad
|
2022-04-11 14:30:30 +08:00 |
|
MustangDeng
|
b850f5ad8d
|
工资单发放-todo
|
2022-04-11 14:28:45 +08:00 |