Commit Graph

8 Commits

Author SHA1 Message Date
钱涛 f3577d3ddd Merge branch 'feature/数据推送' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/constant/SalaryDefaultTenantConstant.java
#	src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
#	src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/service/AddUpDeductionService.java
#	src/com/engine/salary/service/OtherDeductionService.java
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/web/SalarySobController.java
#	src/com/engine/salary/wrapper/SalarySobWrapper.java
2025-02-12 14:00:43 +08:00
钱涛 d959c75ce0 业务线操作日志 2024-09-24 10:19:06 +08:00
钱涛 e1e00f4db0 在线算税v1 2024-06-06 13:51:33 +08:00
钱涛 836947725f 切换了elog位置 2024-03-12 14:34:44 +08:00
Harryxzy dee20149bb 日志 2024-02-21 18:19:02 +08:00
钱涛 a8bfe83030 操作日志 2024-01-30 09:58:13 +08:00
钱涛 bd0edcf8e2 日志组件 2023-12-22 14:50:16 +08:00
钱涛 7e980db4b3 日志组件 2023-12-21 20:25:00 +08:00