钱涛 63e414e5d7 Merge branch 'develop' into feature/qt ... # Conflicts: # src/com/engine/salary/enums/UserStatusEnum.java		2022-04-01 13:54:27 +08:00
..
datacollection	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
salaryaccounting	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
salaryarchive	导入参数	2022-04-01 10:26:28 +08:00
salarybill	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
salaryitem	相对更新	2022-03-24 16:59:52 +08:00
salarysob	薪资项目&账套	2022-03-22 21:01:38 +08:00
siaccount	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
sicategory	列表添加id	2022-03-23 18:41:38 +08:00
BaseEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
OperateTypeEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryCycleTypeEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryDataSourceEnum.java	列表添加id	2022-03-23 18:41:38 +08:00
SalaryFormulaReferenceEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryItemCategoryEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryItemTypeEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryOnOffEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryRoundingModeEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalarySobStatusEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalarySystemTypeEnum.java	税率接口及相关基础类	2022-03-01 16:45:57 +08:00
SalaryUserStatusEnum.java	薪资档案	2022-03-28 20:04:27 +08:00
SalaryValueTypeEnum.java	列表添加id	2022-03-23 18:41:38 +08:00
UserStatusEnum.java	Merge branch 'develop' into feature/qt	2022-04-01 13:54:27 +08:00