Commit Graph

361 Commits

Author SHA1 Message Date
钱涛 6795b4a71a 百川二开 2026-03-30 10:17:53 +08:00
钱涛 ff501c3245 Merge branch 'release/3.0.2.2504.01' into custom/宁波百川港通国际物流有限公司 2026-03-30 10:16:59 +08:00
钱涛 df53975ed7 处理pg数据库适配问题 2026-03-27 16:54:20 +08:00
钱涛 913ab9a0c3 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2026-03-27 16:52:12 +08:00
钱涛 3fe458f392 处理pg数据库适配问题 2026-03-26 16:22:56 +08:00
钱涛 78eba63113 百川港需求 2026-03-25 15:44:49 +08:00
钱涛 6591df30a9 百川港需求 2026-03-25 15:34:17 +08:00
钱涛 7740241af8 百川港需求 2026-03-25 15:27:10 +08:00
钱涛 3b772e0f91 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01
# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties
2026-01-16 14:42:43 +08:00
钱涛 629ff298a6 版本 2026-01-16 13:58:58 +08:00
钱涛 84e57edee1 常见sql 2025-11-18 17:52:26 +08:00
钱涛 4b717e9b2c Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-11-13 11:38:08 +08:00
钱涛 6a061592e5 处理pg脚本 2025-11-13 11:37:46 +08:00
钱涛 0a1acc89d3 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-10-29 15:46:38 +08:00
钱涛 b4994dab3f 常用sql 2025-10-29 15:46:24 +08:00
钱涛 038fac392c Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-10-21 16:56:09 +08:00
钱涛 953a590cca 常用sql 2025-10-21 16:55:42 +08:00
钱涛 0adfa422a4 版本 2025-10-13 13:47:55 +08:00
钱涛 9830b156a5 Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01 2025-07-07 10:21:09 +08:00
钱涛 8168a42b61 日志 2025-07-07 10:20:53 +08:00
钱涛 45acec8468 上线版本 2025-06-19 14:40:09 +08:00
钱涛 ac1a767a29 版本 2025-05-09 10:19:58 +08:00
钱涛 98556e3a90 修改oracle去除; 2025-05-09 10:13:08 +08:00
钱涛 1a66a1f846 版本 2025-04-29 16:07:51 +08:00
钱涛 64ad0a30d4 修复sql部署异常 2025-04-21 10:33:06 +08:00
钱涛 4d56cde7a9 版本 2025-04-17 15:34:29 +08:00
钱涛 c04dad0c4d 修改字段名 2025-04-09 14:23:38 +08:00
钱涛 f4c025e078 数据推送 2025-04-07 09:19:47 +08:00
钱涛 d4f45d5eb3 扩展排序字段 2025-04-03 10:49:10 +08:00
钱涛 0a78f17230 记录推送耗时 2025-04-02 17:05:04 +08:00
钱涛 8e3c4bfacc 数据推送配置sql 2025-04-01 16:43:02 +08:00
钱涛 97546393a4 上线版本 2025-03-27 16:31:40 +08:00
钱涛 8a49a2ef1b 上线版本 2025-03-27 16:13:19 +08:00
钱涛 93defb41cd 版本 2025-03-20 17:32:06 +08:00
钱涛 93b98ce583 版本 2025-02-20 10:54:52 +08:00
钱涛 f2b71b1c38 Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-02-08 09:59:44 +08:00
钱涛 0dd98cf616 薪资excel模板导出 2025-02-06 16:11:39 +08:00
Harryxzy 81e8b70746 Merge branch 'release/2.19.1.2501.01' into feature/数据推送 2025-02-06 14:22:06 +08:00
钱涛 0aabf7df6c 处理sql异常 2025-01-22 15:06:03 +08:00
钱涛 50c3bbf41d Merge branch 'release/2.19.1.2501.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
2025-01-21 17:14:47 +08:00
钱涛 5e95742508 人事信息快照表 2025-01-15 16:39:50 +08:00
钱涛 5a0ef67816 版本 2025-01-03 09:14:08 +08:00
钱涛 8f697eba36 版本 2025-01-02 15:00:21 +08:00
钱涛 35aff0431e Merge branch 'release/2.18.2.2412.02' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySendServiceImpl.java
2024-12-27 09:24:22 +08:00
钱涛 b3dcafa6f1 版本号 2024-12-09 15:12:33 +08:00
钱涛 3d61bfa9a6 薪资报表明细显示定制列配置 2024-12-03 10:45:03 +08:00
钱涛 94da757524 Merge branch 'release/2.17.1.2411.01' into feature/数据推送
# Conflicts:
#	src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
2024-11-26 14:21:02 +08:00
钱涛 de5a00f588 修改默认列设置功能 2024-11-25 16:04:19 +08:00
钱涛 38b283e9ba 推送记录 2024-11-22 10:59:16 +08:00
钱涛 2fe7b7dc03 Merge branch 'release/2.17.1.2411.01' into feature/数据推送 2024-11-20 18:43:59 +08:00