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
..
sql202205100201.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202205100402.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202205130903.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202205200203.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202205310203.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202206071403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202206090403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202206141003.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202206160500.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202206230403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202207110803.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202207120303.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202207210203.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202208051103.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202208080403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202208240403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202208240503.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202210080203.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202210080403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202210170203.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202210170303.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202211090103.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202211090301.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202211090402.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202211170503.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202212080903.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202212081003.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202212230103.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202301310403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202302060801.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202302060902.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202302090303.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202302200403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202303130101.sql	非系统人员初始化语句	2023-07-20 14:43:50 +08:00
sql202303130202.sql	非系统人员初始化语句	2023-07-20 14:43:50 +08:00
sql202303150403.sql	非系统人员初始化语句	2023-07-20 14:43:50 +08:00
sql202304040503.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202304260103.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202304270203.sql	去除报表原先的表	2024-03-07 11:45:26 +08:00
sql202304270303.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202304270501.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202305050302.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202305170903.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202306020403.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202306020603.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202306080103.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202306200203.sql	上线脚本	2023-06-26 15:48:25 +08:00
sql202306260103.sql	水印上线脚本	2023-06-26 16:22:19 +08:00
sql202307170403.sql	解决sql202307100103.sql与组织冲突	2023-09-01 11:33:20 +08:00
sql202307180603.sql	薪资项目-核算时隐藏sql	2023-07-19 09:35:30 +08:00
sql202307200603.sql	非系统人员浏览按钮	2023-07-20 15:34:10 +08:00
sql202308080403.sql	sql	2023-08-08 11:05:52 +08:00
sql202308080503.sql	sql	2023-08-08 11:42:24 +08:00
sql202308090203.sql	薪酬系统-福利档案，修改社保、公积金、其他福利表结构	2023-08-09 18:19:42 +08:00
sql202308170403.sql	sql	2023-08-17 16:06:55 +08:00
sql202309210203.sql	sql	2023-09-21 10:05:32 +08:00
sql202310130403.sql	修改系统公式异常	2023-10-13 16:54:33 +08:00
sql202310250103.sql	薪酬系统-福利档案，福利档案基数调整记录表新建sql脚本	2023-10-25 09:49:16 +08:00
sql202311070403.sql	数据库表	2023-11-07 15:12:10 +08:00
sql202311080603.sql	新增统计维度展示	2023-11-08 15:59:54 +08:00
sql202311150103.sql	短信模板脚本	2023-11-21 16:17:47 +08:00
sql202311230103CSKH.sql	sql	2023-12-13 10:39:57 +08:00
sql202312130203.sql	薪酬系统-福利档案，拆分个人和公司福利基数逻辑相关sql脚本	2023-12-13 10:51:24 +08:00
sql202401080103.sql	sql	2024-01-08 15:32:49 +08:00
sql202401230403.sql	elog脚本	2024-01-23 15:00:46 +08:00
sql202401300303.sql	sql	2024-01-30 16:00:50 +08:00
sql202402190103.sql	工资单确认反馈sql	2024-02-19 14:01:30 +08:00
sql202402280703.sql	添加账套筛选条件sql	2024-02-28 14:54:13 +08:00
sql202403150103.sql	sql	2024-03-15 09:31:04 +08:00