黎永顺 25f2c2efd6 Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01 ... # Conflicts: # pc4mobx/hrmSalary/pages/mobilePayroll/index.js # pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js # pc4mobx/hrmSalary/pages/ruleConfig/index.js		2023-07-17 13:50:54 +08:00
..
analysisOfSalaryStatistics	薪酬统计分析添加员工明细列表的统计行	2023-05-26 14:51:17 +08:00
appConfig	薪酬页面滚动的修改	2023-02-13 10:41:40 +08:00
calculate	产品-薪资核算弹框样式修改	2023-07-07 13:45:11 +08:00
calculateDetail	产品-薪資核算核算页面的列表带搜索条件翻页查询不错的bug修复	2023-07-13 09:37:17 +08:00
dataAcquisition	Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01	2023-07-11 10:11:58 +08:00
declare	产品-个税申报表添加撤回的功能	2023-06-12 14:51:09 +08:00
employeeView	薪酬统计分析-员工详情列表修改	2023-05-26 16:05:28 +08:00
equationEditor	产品-公式编辑器	2023-04-28 16:11:56 +08:00
fieldManagement	Merge branch 'feature/V2-字段管理列表排序功能' into develop	2023-06-01 17:20:30 +08:00
individualIncomeTaxRateForm	统一系统右键	2022-12-01 14:28:30 +08:00
ledger	Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01	2023-07-11 10:11:58 +08:00
ledgerPage	Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01	2023-07-11 10:11:58 +08:00
mobilePayroll	Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01	2023-07-17 13:50:54 +08:00
mySalary	产品-工资单反馈开发	2023-07-17 11:43:14 +08:00
payroll	Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01	2023-07-17 13:50:54 +08:00
payrollFiles	Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01	2023-07-13 15:11:06 +08:00
reportView	产品-薪酬统计报表echarts图标组件封装	2023-07-10 15:52:25 +08:00
ruleConfig	Merge branch 'feature/2.8.3.2307.02-工资单反馈' into release/2.8.3.2307.01	2023-07-17 13:50:54 +08:00
salaryFile	已知bug修复	2023-02-24 15:52:19 +08:00
salaryItem	产品-列表上面操作按钮显示两个	2023-06-26 11:27:27 +08:00
socialSecurityBenefits	Merge branch 'master' into hotfix/2.8.3.2307.02	2023-07-14 15:32:06 +08:00
sysConfig	薪资档案以及社保福利档案页面添加四个tab的列表查询	2022-10-17 10:03:01 +08:00
taxAgent	产品-统一页面列表操作按钮	2023-07-03 15:42:11 +08:00
taxRate	统一系统右键	2022-12-01 14:28:30 +08:00