 钱涛
|
57798a8e3e
|
短信验证码功能
|
2023-06-14 15:51:26 +08:00 |
|
钱涛
|
8bde871286
|
档案返回列表状态
|
2023-06-12 15:36:27 +08:00 |
Harryxzy
|
b2f39f56e2
|
Merge branch 'fix/sysSalaryItemSearchBUG' into release/2.8.3.2306.01
|
2023-06-09 09:50:25 +08:00 |
|
钱涛
|
f881fa2766
|
取消注释
|
2023-06-08 17:19:19 +08:00 |
|
Harryxzy
|
dbb2a97be4
|
系统薪资项目列表显示改造
|
2023-06-08 11:10:40 +08:00 |
|
钱涛
|
37d9c04a30
|
去除发放状态中文转换
|
2023-06-07 09:43:54 +08:00 |
|
钱涛
|
4a258aa45b
|
替换短信发送方法
|
2023-06-06 16:40:09 +08:00 |
|
钱涛
|
f154753698
|
拦截短信
|
2023-06-06 15:02:53 +08:00 |
|
钱涛
|
4358dc20a5
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-06-06 14:24:23 +08:00 |
|
钱涛
|
0e5eb1b11e
|
工资单发送
|
2023-06-06 11:48:19 +08:00 |
|
钱涛
|
993db67601
|
公共进度条功能
|
2023-06-06 10:30:49 +08:00 |
|
钱涛
|
91e3b335dd
|
工资单通道
|
2023-06-05 13:35:17 +08:00 |
|
Harryxzy
|
74c5b4f19f
|
薪资项目 和 字段管理的排序
|
2023-06-01 17:52:31 +08:00 |
|
钱涛
|
4be4acc5d8
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
# Conflicts:
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
|
2023-06-01 11:49:16 +08:00 |
|
Harryxzy
|
601b90d188
|
薪资档案薪资项目排序
|
2023-05-31 09:55:24 +08:00 |
|
钱涛
|
220848e92d
|
档案项目正序排列
|
2023-05-26 11:15:40 +08:00 |
|
钱涛
|
ec90e31695
|
Merge branch 'release/2.8.3.2306.01' into feature/短信邮件
|
2023-05-24 16:20:39 +08:00 |
|
钱涛
|
8ad88b1e97
|
我的工资接口修改
|
2023-05-17 14:10:12 +08:00 |
|
钱涛
|
6b19445a1a
|
Merge branch 'release/2.8.2.2305.02' into feature/公式
# Conflicts:
# src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
|
2023-05-08 11:22:23 +08:00 |
|
钱涛
|
8228fbf21c
|
短信邮件
|
2023-05-08 09:27:20 +08:00 |
|
钱涛
|
2d8b4b07d0
|
Merge branch 'release/2.7.4.2304.02' into feature/报表
# Conflicts:
# src/com/engine/salary/biz/SIArchivesBiz.java
|
2023-04-28 10:49:33 +08:00 |
|
钱涛
|
40cd70e2a3
|
Merge branch 'release/2.7.4.2304.02' into feature/公式
|
2023-04-25 17:39:33 +08:00 |
|
钱涛
|
a19b19e23d
|
公式
|
2023-04-19 10:15:01 +08:00 |
|
Harryxzy
|
b5d3acf418
|
Merge branch 'feature/salaryItemFieldsCanCopy_0420' into release/2.7.3.2304.01
|
2023-04-14 09:04:23 +08:00 |
|
Harryxzy
|
82ee707f16
|
employebiz改成employeeservice
|
2023-04-12 15:27:35 +08:00 |
|
Harryxzy
|
482f4dfc25
|
薪资项目名不允许包含大括号
|
2023-04-11 10:36:06 +08:00 |
|
钱涛
|
b0284022c1
|
核算导出全部功能修复
|
2023-04-07 14:39:22 +08:00 |
|
Harryxzy
|
712f30ddfa
|
工资单发放详情合计列
|
2023-03-15 16:00:37 +08:00 |
|
钱涛
|
db09f8047e
|
注释
|
2023-03-15 11:04:54 +08:00 |
|
Harryxzy
|
7de5c1e175
|
Merge branch 'fix/V3_listShowChange_0309' into release/2.7.1.2303.02
|
2023-03-10 15:42:42 +08:00 |
sy
|
dbf9e878e5
|
Merge remote-tracking branch 'remotes/origin/feature/v4-addSiAcctLog-0309' into release/2.7.1.2303.02
|
2023-03-08 17:52:09 +08:00 |
|
sy
|
b6ee197fe6
|
薪酬系统,梳理Mapper类使用方式
|
2023-03-07 14:21:01 +08:00 |
|
Harryxzy
|
b702286995
|
考勤数据，详情数据 前端渲染方式改变
|
2023-03-07 11:36:45 +08:00 |
|
钱涛
|
890ff64215
|
mock接口
|
2023-03-06 19:45:48 +08:00 |
|
Harryxzy
|
f48e98cb11
|
补发工资单模块，薪资项目名称修改时，展示同步修改
|
2023-03-02 14:51:51 +08:00 |
|
钱涛
|
e73ed7142f
|
正常核算工资单模板同步项目名称
|
2023-03-02 13:37:28 +08:00 |
|
钱涛
|
8c8d79aba3
|
档案字段删除
|
2023-02-27 18:27:11 +08:00 |
|
钱涛
|
5f9a7af0fa
|
修复数据采集按部门搜索
|
2023-02-22 17:58:19 +08:00 |
|
钱涛
|
abeb4d891d
|
薪资项目删除校验
|
2023-02-17 14:37:59 +08:00 |
|
钱涛
|
da9b548480
|
公式
|
2023-02-17 10:54:18 +08:00 |
|
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
|
钱涛
|
91bd28d21a
|
清除公式
|
2023-02-16 10:44:13 +08:00 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
53c767b239
|
还原脚本
|
2023-02-15 17:36:29 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +08:00 |
|
钱涛
|
1c93dab9f0
|
获取人员档案
|
2023-02-14 15:41:03 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
|
钱涛
|
49894ad6a2
|
修复申报表总数
|
2023-02-13 10:59:09 +08:00 |
|
Harryxzy
|
510a2e7d29
|
处理工资单发放历史数据执行时间提前
|
2023-02-09 19:43:43 +08:00 |
fcli
|
5b50903b55
|
Merge branch 'feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 18:48:35 +08:00 |