黎永顺 4c8c3e7251 Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税 ... # Conflicts: # pc4mobx/hrmSalary/apis/index.js # pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js # pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js # pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/layout.js # pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js # pc4mobx/hrmSalary/pages/declare/declare.js		2024-03-06 14:42:29 +08:00
..
StandingBook.js	feature/2.10.1.2401.01-社保福利台账列表页面重构	2024-01-23 15:38:03 +08:00
archives.js	feature/2.9.42310.02-社保福利档案页面重构	2023-11-08 13:37:33 +08:00
attendanceStore.js	feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置	2023-11-07 16:21:17 +08:00
baseForm.js	release/2.10.1.2402.01-个税	2024-02-23 17:38:42 +08:00
baseTable.js	2022-02-25	2022-02-25 09:24:56 +08:00
calculate.js	feature/2.9.9.2312.01-薪资核算列表在线编辑-批量更新薪资项目项	2023-12-06 14:46:36 +08:00
cumDeduct.js	Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税	2023-10-26 10:41:40 +08:00
cumSituation.js	hotfix/2.9.42310.02	2023-10-25 15:45:38 +08:00
declare.js	hotfix/2.9.9.2312.02-个税	2024-01-02 10:33:31 +08:00
employeeDeclare.js	个税对接-人员信息报送详情页	2023-08-14 17:08:40 +08:00
externalPersonManage.js	非系统人员管理-新功能开发	2023-03-13 10:43:25 +08:00
index.js	智能算薪-其他三个tab下的配置开发	2023-08-29 11:34:45 +08:00
intelligent.js	智能算薪-其他三个tab页的功能开发	2023-08-30 10:34:16 +08:00
ledger.js	feature/2.9.42311.02-社保核算以及薪资账套查询优化	2023-11-27 19:17:44 +08:00
mySalary.js	hotfix/2.9.42311.02-我的薪资福利页面重构	2023-11-20 17:48:44 +08:00
otherDeduct.js	hotfix/2.9.42310.02	2023-10-25 15:45:38 +08:00
payroll.js	feature/2.9.42310.01-工资单发放页面重构	2023-10-18 17:12:44 +08:00
payrollFiles.js	feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发	2024-03-01 16:56:32 +08:00
programme.js	feature/2.10.1.2401.01-社保福利方案重构	2024-02-05 14:53:38 +08:00
salaryFile.js	薪资档案发薪员工页面的调薪页面重构	2023-09-04 16:48:36 +08:00
salaryItem.js	hotfix/2.9.42310.01	2023-10-19 13:38:00 +08:00
specialAdd.js	hotfix/2.9.42310.02	2023-10-25 15:45:38 +08:00
taxAgent.js	hotfix/2.9.9.2312.01-个税	2023-12-07 15:43:37 +08:00
taxRate.js	薪资档案待停薪页面添加取消待办的功能	2023-03-29 09:28:55 +08:00