qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
salary-management-front/pc4mobx/hrmSalary/pages
History
黎永顺 8b1f16e016 Merge branch 'develop' into feature/V2-dev合并多语言 
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
#	pc4mobx/hrmSalary/pages/externalPersonManage/index.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
#	pc4mobx/hrmSalary/pages/ledgerPage/index.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
#	pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js
#	pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
 		2023-08-01 10:24:03 +08:00
..
analysisOfSalaryStatistics 产品-系统多语言 2023-07-31 18:58:54 +08:00
appConfig 产品-多语言 2023-07-27 11:47:24 +08:00
calculate Merge branch 'develop' into feature/V2-dev合并多语言 2023-07-27 10:43:14 +08:00
calculateDetail Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
dataAcquisition 系统多语言-添加 2023-07-04 11:11:57 +08:00
declare 产品-多语言 2023-07-27 11:34:37 +08:00
employeeView 产品-系统多语言 2023-07-31 15:30:28 +08:00
equationEditor 产品-公式编辑器 2023-04-28 16:11:56 +08:00
externalPersonManage Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
fieldManagement 产品-系统多语言 2023-07-31 18:58:54 +08:00
individualIncomeTaxRateForm 统一系统右键 2022-12-01 14:28:30 +08:00
ledger 产品-多语言 2023-07-27 11:34:37 +08:00
ledgerPage Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
mobilePayroll Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
mySalary Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
payroll Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
payrollFiles Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
reportView 产品-系统多语言 2023-07-31 15:30:28 +08:00
ruleConfig Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
salaryFile 产品-系统多语言 2023-07-31 15:30:28 +08:00
salaryItem Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
socialSecurityBenefits Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
sysConfig 产品-合并系统多语言 2023-06-09 11:38:20 +08:00
taxAgent Merge branch 'develop' into feature/V2-dev合并多语言 2023-08-01 10:24:03 +08:00
taxRate 产品-合并系统多语言 2023-06-09 14:44:18 +08:00