weaver-hrm-salary/resource/wiki
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
..
代码样例/拦截工资单相关接口/com/customization/salary Merge branch 'release/2.12.1.2403.02' into custom/上海港湾-多语言 2024-03-28 15:47:11 +08:00
扩展功能 去除非标准功能 2024-03-12 14:51:28 +08:00
Oracle常见问题.txt 添加wiki目录 2024-03-05 17:37:47 +08:00
个人养老金.sql 添加wiki目录 2024-03-05 17:37:47 +08:00
人员生成不了档案.sql 添加wiki目录 2024-03-05 17:37:47 +08:00
删除档案.txt 添加wiki目录 2024-03-05 17:37:47 +08:00
薪资档案重复.sql 添加wiki目录 2024-03-05 17:37:47 +08:00
薪酬开关配置 添加wiki目录 2024-03-05 17:37:47 +08:00
薪酬还原脚本.sql 去除报表原先的表 2024-03-07 11:45:26 +08:00