黎永顺 c059c013b2 Merge branch 'feature/V2-系统多语言' into feature/V2-dev合并多语言 ... # Conflicts: # pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js # pc4mobx/hrmSalary/pages/calculateDetail/editSalaryDetail.js # pc4mobx/hrmSalary/pages/calculateDetail/index.js # pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js # pc4mobx/hrmSalary/pages/calculateDetail/userSure.js # pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js # pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js # pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js # pc4mobx/hrmSalary/pages/payrollFiles/index.js # pc4mobx/hrmSalary/pages/salaryItem/columns.js # pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js # pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js # pc4mobx/hrmSalary/pages/taxAgent/index.js # pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js		2023-06-02 11:35:39 +08:00
..
components	Merge branch 'feature/V2-系统多语言' into feature/V2-dev合并多语言	2023-06-02 11:35:39 +08:00
config	薪资档案以及社保福利档案页面添加四个tab的列表查询	2022-10-17 10:03:01 +08:00
index.js	Merge branch 'feature/V2-系统多语言' into feature/V2-dev合并多语言	2023-06-02 11:35:39 +08:00
index.less	产品-薪资档案列表改造完成	2023-05-26 10:44:05 +08:00