 钱涛
|
9b390faf50
|
SQL适配
|
2024-08-19 11:33:15 +08:00 |
|
钱涛
|
a796752203
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
|
2024-08-19 10:43:43 +08:00 |
Harryxzy
|
8742ee7857
|
Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01
|
2024-08-16 15:27:15 +08:00 |
|
钱涛
|
22c99e081d
|
支持Vlookup
|
2024-08-16 14:39:01 +08:00 |
|
钱涛
|
4b9341cc98
|
支持Vlookup
|
2024-08-16 14:13:59 +08:00 |
|
钱涛
|
4b30292c6c
|
支持Vlookup
|
2024-08-16 14:07:16 +08:00 |
|
钱涛
|
d23baeb940
|
支持Vlookup
|
2024-08-16 12:19:18 +08:00 |
|
Harryxzy
|
be6e7bb787
|
工资明细导出excel单元格格式
|
2024-08-16 11:08:57 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
钱涛
|
22ccad05ad
|
排除显示
|
2024-08-15 13:47:55 +08:00 |
|
钱涛
|
c5c469e4c4
|
修复邮件不显示入职日期
|
2024-08-15 11:54:18 +08:00 |
|
Harryxzy
|
e9fef7d915
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 11:10:49 +08:00 |
|
Harryxzy
|
4348954994
|
Merge branch 'feature/240801-报表义务人、账套分权' into release/2.15.1.2407.01
|
2024-08-15 11:09:09 +08:00 |
|
钱涛
|
2b2e9ea504
|
账套支持sql范围
|
2024-08-15 10:53:08 +08:00 |
|
钱涛
|
d37434521d
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 10:37:57 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
Harryxzy
|
832a6ac1ec
|
社保福利台账明细导入2100bug
|
2024-08-14 11:17:56 +08:00 |
|
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
钱涛
|
e0271c3006
|
成员和数据批量保存
|
2024-08-08 10:01:41 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
23ed2c5f3f
|
删除、同步对象设置
|
2024-08-06 10:46:33 +08:00 |
|
钱涛
|
84cb57ccd7
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-05 17:23:47 +08:00 |
|
钱涛
|
ff00de206c
|
线下对比
|
2024-08-05 17:23:25 +08:00 |
|
钱涛
|
4dcb3b4fea
|
薪资档案分权
|
2024-08-05 15:40:34 +08:00 |
|
钱涛
|
4d8c54bf8a
|
角色加描述
|
2024-08-02 16:18:26 +08:00 |
|
钱涛
|
494679087d
|
角色加描述
|
2024-08-02 14:04:14 +08:00 |
|
钱涛
|
9eea989bf2
|
显示扣缴义务人的角色
|
2024-08-02 10:10:04 +08:00 |
|
钱涛
|
4d51b6e57c
|
显示扣缴义务人的角色
|
2024-08-01 18:04:09 +08:00 |
|
钱涛
|
a0d2db2702
|
角色
|
2024-08-01 16:19:23 +08:00 |
|
钱涛
|
c674c22da1
|
在线算税重试处理
|
2024-08-01 10:56:29 +08:00 |
|
Harryxzy
|
8d057e2706
|
Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01
|
2024-08-01 10:53:29 +08:00 |
|
Harryxzy
|
8bbf8f3ff6
|
核算时编辑职称bug
|
2024-08-01 10:52:44 +08:00 |
|
钱涛
|
a8b487c94b
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-08-01 10:16:05 +08:00 |
|
钱涛
|
241a85c711
|
默认值
|
2024-07-31 14:59:03 +08:00 |
|
钱涛
|
6f55def466
|
权限数据
|
2024-07-30 18:55:02 +08:00 |
|
Harryxzy
|
bcf5fbdce7
|
Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01
|
2024-07-30 18:17:49 +08:00 |
|
钱涛
|
87a5eb59c6
|
暂存
|
2024-07-30 17:45:02 +08:00 |
|
Harryxzy
|
0c3610961f
|
修复社保福利档案 高级搜索后下载导入模板bug
|
2024-07-30 17:29:12 +08:00 |
|
钱涛
|
fad1402b06
|
权限项配置
|
2024-07-29 16:00:27 +08:00 |
|
钱涛
|
63012fd62a
|
成员列表
|
2024-07-29 13:28:46 +08:00 |
|
Harryxzy
|
9819bb25e0
|
修复社保福利台账补差添加bug
|
2024-07-29 10:58:41 +08:00 |
|
钱涛
|
a976dbc9c5
|
成员同步
|
2024-07-29 09:46:01 +08:00 |
|
钱涛
|
76543c6021
|
成员同步
|
2024-07-26 16:35:51 +08:00 |
|
钱涛
|
0b091eee12
|
成员表达式变更
|
2024-07-26 14:32:35 +08:00 |
|
钱涛
|
e30ae5a2a1
|
成员表达式变更
|
2024-07-26 14:30:14 +08:00 |
|
钱涛
|
4543539206
|
角色和成员基础接口
|
2024-07-26 11:35:17 +08:00 |
|
Harryxzy
|
ec669c1f51
|
核算时编辑人员组织信息
|
2024-07-25 17:51:38 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
Harryxzy
|
671350654a
|
fix薪资明细报表显示列定制
|
2024-07-22 15:29:34 +08:00 |
|
Harryxzy
|
039c6fd568
|
薪资明细报表合计行过滤文本项
|
2024-07-22 10:27:46 +08:00 |