黎永顺 8bac520ff0 Merge branch 'develop' into feature/V2-dev合并多语言 ... # Conflicts: # pc4mobx/hrmSalary/pages/calculateDetail/index.js # pc4mobx/hrmSalary/pages/calculateDetail/userSure.js # pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js # pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js # pc4mobx/hrmSalary/pages/mobilePayroll/index.js # pc4mobx/hrmSalary/pages/payroll/index.js # pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js # pc4mobx/hrmSalary/pages/payrollFiles/index.js # pc4mobx/hrmSalary/pages/ruleConfig/index.js # pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js # pc4mobx/hrmSalary/pages/salaryItem/columns.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js # pc4mobx/hrmSalary/pages/taxAgent/personalScope.js # pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js		2023-07-27 10:43:14 +08:00
..
RSAUtil.js	产品-移动端二次验证密码设置	2023-07-10 09:21:57 +08:00
date.js	产品-合并系统多语言	2023-06-09 14:44:18 +08:00
index.js	非系统人员开发合并	2023-07-12 14:34:07 +08:00
options.js	薪酬统计分析-员工明细列表开发	2023-05-25 13:27:17 +08:00
request.js	薪资账套	2022-03-30 20:04:34 +08:00
response.js	bug修复	2022-05-24 23:55:12 +08:00
url.js	数据采集模块四个页面的导出全部功能添加参数的筛选功能以及薪资核算页面的带条件导出全部的功能	2023-04-06 17:07:22 +08:00
validate.js	新增工资单模板	2022-04-13 16:56:31 +08:00