Harryxzy
|
c0562d9c6b
|
港湾多语言
|
2024-04-02 16:25:40 +08:00 |
|
Harryxzy
|
bfec936bc4
|
Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言
# Conflicts:
# src/com/engine/salary/biz/AddUpDeductionBiz.java
# src/com/engine/salary/biz/AddUpSituationBiz.java
# src/com/engine/salary/biz/OtherDeductionBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SICategoryBiz.java
# src/com/engine/salary/biz/SalaryArchiveItemBiz.java
# src/com/engine/salary/biz/SpecialAddDeductionBiz.java
# src/com/engine/salary/cmd/siarchives/SIArchivesTipsCmd.java
# src/com/engine/salary/entity/datacollection/AddUpDeduction.java
# src/com/engine/salary/entity/datacollection/AddUpSituation.java
# src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java
# src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java
# src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
# src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
# src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
# src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
# src/com/engine/salary/entity/salaryBill/param/SalaryTemplateCopyParam.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
# src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
# src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java
# src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java
# src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
# src/com/engine/salary/entity/sicategory/dto/ICategoryListDTO.java
# src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java
# src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java
# src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java
# src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java
# src/com/engine/salary/enums/OperateTypeEnum.java
# src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
# src/com/engine/salary/enums/salaryarchive/SalaryArchiveStatusEnum.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
# src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
# src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java
# src/com/engine/salary/service/SalaryAcctResultService.java
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/SalarySendService.java
# src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
# src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
# src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
# src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
# src/com/engine/salary/service/impl/SICategoryServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
# src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
# src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
# src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
# src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
# src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
# src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/util/SalaryI18nUtil.java
# src/com/engine/salary/util/page/SalaryPageUtil.java
# src/com/engine/salary/web/SIExportController.java
# src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
# src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
|
2024-03-28 15:47:11 +08:00 |
 钱涛
|
836947725f
|
切换了elog位置
|
2024-03-12 14:34:44 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
sy
|
c24572d911
|
薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑
|
2023-06-21 14:51:41 +08:00 |
|
sy
|
b92cc5564f
|
薪酬系统-多语言配置，适配部分中文字符串0427
|
2023-04-27 18:00:04 +08:00 |
|
钱涛
|
9bedcf6d38
|
年终奖
|
2023-01-31 14:15:27 +08:00 |
|
钱涛
|
54e64f58cb
|
申报表导出bug
|
2022-11-03 10:36:50 +08:00 |
|
钱涛
|
2731e4eddd
|
sql
|
2022-06-15 16:31:40 +08:00 |
|
钱涛
|
455ff23134
|
申报表导出修改
|
2022-06-15 16:02:34 +08:00 |
18895359881@163.com
|
5b90c0524f
|
身份类型
|
2022-04-20 16:45:09 +08:00 |
|
18895359881@163.com
|
ad3af977ab
|
申报表导出完善
|
2022-04-20 16:02:52 +08:00 |
|
18895359881@163.com
|
bfdb9a33d5
|
个税申报表接口
|
2022-04-19 20:58:30 +08:00 |
|
18895359881@163.com
|
6fce8cdf4c
|
薪酬接口
|
2022-04-18 18:56:17 +08:00 |