钱涛 ec27cf5a08 Merge branch 'release/2.13.1.2404.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/service/AddUpDeductionService.java # src/com/engine/salary/wrapper/AddUpDeductionWrapper.java		2024-05-08 11:17:40 +08:00
..
common	修复核算结果可能为0	2023-11-29 17:45:16 +08:00
datacollection	在线获取累计专项附加扣除	2023-09-04 09:29:00 +08:00
employeedeclare	外籍人员更新	2024-04-11 18:57:56 +08:00
salaryaccounting	人员信息报送temp	2023-08-08 09:21:14 +08:00
salaryarchive	Merge branch 'release/2.11.1.2402.01' into feature/操作日志组件	2024-03-04 09:41:35 +08:00
salarybill	工资单反馈	2023-07-17 15:01:14 +08:00
salaryformula	sql可以使用薪资项目作为变量	2023-10-07 17:00:02 +08:00
salaryitem	薪资项目列表优化	2022-05-05 15:02:12 +08:00
salarysend	工资单定时发送 添加 发放周期	2023-07-04 18:03:57 +08:00
salarysob	内置算税结果	2024-04-10 14:48:58 +08:00
siaccount	薪资档案、社保档案查看日志	2024-03-05 15:15:20 +08:00
sicategory	修复社保福利新建时没有小数位和进位规则对应问题	2024-05-08 10:49:08 +08:00
taxagent	v1	2023-07-20 10:36:29 +08:00
taxdeclaration	补充申报表未填写状态	2024-01-03 13:47:19 +08:00
BaseEnum.java	1、公共枚举接口	2022-07-26 18:01:39 +08:00
OperateTypeEnum.java	增加操作日志类型	2024-02-18 11:39:49 +08:00
SalaryCycleTypeEnum.java	修复社保福利列表高级搜索	2022-08-11 10:27:15 +08:00
SalaryDataSourceEnum.java	修复社保福利列表高级搜索	2022-08-11 10:27:15 +08:00
SalaryItemCategoryEnum.java	账套薪资项目添加code	2023-08-23 16:49:45 +08:00
SalaryItemTypeEnum.java	账套薪资项目添加code	2023-08-23 16:49:45 +08:00
SalaryJobFlagEnum.java	暂存	2022-05-18 09:19:50 +08:00
SalaryOnOffEnum.java	账套薪资项目添加code	2023-08-23 16:49:45 +08:00
SalaryRoundingModeEnum.java	向上求偶	2022-09-01 16:17:27 +08:00
SalarySobStatusEnum.java	账套薪资项目添加code	2023-08-23 16:49:45 +08:00
SalarySystemTypeEnum.java	账套薪资项目添加code	2023-08-23 16:49:45 +08:00
SalaryValueTypeEnum.java	薪资账套项目页面改造temp	2023-07-25 16:46:57 +08:00
UserStatusEnum.java	账套增加状态字段	2023-10-08 13:38:37 +08:00