Commit Graph

14 Commits

Author SHA1 Message Date
黎永顺 6e832fe873 Merge branch 'develop' into feature/V2-dev合并多语言
# Conflicts:
#	pc4mobx/hrmSalary/pages/calculate/index.js
#	pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
#	pc4mobx/hrmSalary/pages/declare/generateModal.js
#	pc4mobx/hrmSalary/pages/declare/index.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
#	pc4mobx/hrmSalary/pages/mySalary/index.js
#	pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
#	pc4mobx/hrmSalary/pages/payroll/index.js
#	pc4mobx/hrmSalary/pages/payrollFiles/index.js
#	pc4mobx/hrmSalary/pages/reportView/index.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
#	pc4mobx/hrmSalary/pages/taxAgent/index.js
2023-07-04 10:50:53 +08:00
黎永顺 4d91a9b365 产品-个税申报表添加撤回的功能 2023-06-12 14:51:09 +08:00
黎永顺 d114e3b7bd 产品-合并系统多语言 2023-06-09 11:38:20 +08:00
黎永顺 0c9051917b 产品-系统多语言 2023-06-08 18:13:37 +08:00
黎永顺 fbc842724d 产品-多语言开发 2023-06-07 15:27:24 +08:00
黎永顺 d21d987823 产品-系统多语言 2023-05-23 17:03:25 +08:00
黎永顺 d77a3f5fca 薪酬页面滚动的修改 2023-02-13 10:41:40 +08:00
18652063575 aa7ec55294 禅道bug的修复 2022-10-26 18:40:25 +08:00
18652063575 0cec0873fe 统一所有页面你的弹框以及抽屉头部组件 2022-09-13 16:39:15 +08:00
liyongshun 561900ae49 个税申报申报表bug的修复 2022-07-06 18:11:54 +08:00
liyongshun adc089b033 注释个税申报的个税申报人选项 2022-06-07 18:48:25 +08:00
liyongshun 9193e6b2e9 bug修改 2022-06-07 18:24:05 +08:00
MustangDeng bd21135a22 账套公式,个税申报表 2022-04-20 15:28:40 +08:00
MustangDeng 34b9dd6cda 个税申报白鸥 2022-03-18 10:38:43 +08:00