黎永顺 8f7244f119 Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支 ... # Conflicts: # pc4mobx/hrmSalary/components/mobileTemplate/index.js # pc4mobx/hrmSalary/components/pcTemplate/content.js # pc4mobx/hrmSalary/components/selectItemsModal/index.js # pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js # pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js # pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js # pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js # pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js # pc4mobx/hrmSalary/pages/calculate/calculate.js # pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.js # pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js # pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js # pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js # pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js # pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js # pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/importFormCom.js # pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js # pc4mobx/hrmSalary/pages/dataAcquisition/layout.js # pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js # pc4mobx/hrmSalary/pages/externalPersonManage/index.js # pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js # pc4mobx/hrmSalary/pages/fieldManagement/index.js # pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js # pc4mobx/hrmSalary/pages/ledgerPage/index.js # pc4mobx/hrmSalary/pages/mobilePayroll/index.js # pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js # pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js # pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js # pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js # pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js # pc4mobx/hrmSalary/pages/reportView/components/condition.js # pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js # pc4mobx/hrmSalary/pages/ruleConfig/index.js # pc4mobx/hrmSalary/pages/salaryItem/index.js # pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/paymentPeriodModal.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/logDialog/index.js # pc4mobx/hrmSalary/pages/taxAgent/index.js # pc4mobx/hrmSalary/stores/baseForm.js # pc4mobx/hrmSalary/stores/programme.js # pc4mobx/hrmSalary/util/request.js		2024-04-01 15:31:34 +08:00
..
RSAUtil.js	产品-移动端二次验证密码设置	2023-07-10 09:21:57 +08:00
date.js	产品-合并系统多语言	2023-06-09 14:44:18 +08:00
index.js	Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言版本----测试分支	2024-04-01 15:31:34 +08:00
options.js	薪酬统计分析-员工明细列表开发	2023-05-25 13:27:17 +08:00
request.js	hotfix/2.12.1.2403.02	2024-03-19 14:29:00 +08:00
response.js	bug修复	2022-05-24 23:55:12 +08:00
url.js	feature社保福利档案添加非系统人员列表	2023-09-05 16:49:26 +08:00
validate.js	新增工资单模板	2022-04-13 16:56:31 +08:00