Commit Graph

448 Commits

Author SHA1 Message Date
MustangDeng 2ccc30db96 Merge remote-tracking branch 'origin/develop' into develop 2022-05-30 09:14:33 +08:00
MustangDeng d48ef0aeec oracle 适配 2022-05-30 09:14:12 +08:00
钱涛 60ae1ff35b sqlserver
适配
2022-05-27 18:07:26 +08:00
MustangDeng 224c823590 oracle 自增返回 2022-05-27 15:01:44 +08:00
钱涛 d776220cae fix 2022-05-27 09:33:40 +08:00
钱涛 c6ea4c5698 线下对比 2022-05-26 15:45:37 +08:00
钱涛 cf5e914318 Merge remote-tracking branch 'origin/develop' into develop 2022-05-26 13:42:44 +08:00
钱涛 6103c9233e 批量操作数量限制 2022-05-26 13:41:58 +08:00
MustangDeng 968a48eed2 取消福利归档前异常数据校验 2022-05-26 13:30:23 +08:00
MustangDeng 615bb51a59 Merge remote-tracking branch 'origin/develop' into develop 2022-05-26 11:00:58 +08:00
MustangDeng 05dc46894d 总览数据不对问题 2022-05-26 11:00:38 +08:00
钱涛 8e2e420d6a 处理sqlserver参数过多异常 2022-05-25 17:15:16 +08:00
MustangDeng 5abd648e9b Merge remote-tracking branch 'origin/develop' into develop 2022-05-25 13:23:15 +08:00
MustangDeng 402a3304cc 福利核算数据量过大的情况 2022-05-25 13:23:02 +08:00
钱涛 f066d1ef64 fix档案分页 2022-05-25 13:13:03 +08:00
钱涛 99fda7ecc3 修复调薪记录 2022-05-25 11:09:48 +08:00
MustangDeng 5cd4e46b8a Merge remote-tracking branch 'origin/develop' into develop 2022-05-24 13:42:25 +08:00
MustangDeng fe1cb27004 修复 自定义福利中已经停用某项福利,但新增方案时候还能引用 2022-05-24 13:42:15 +08:00
钱涛 f555192e70 升级 2022-05-24 11:24:21 +08:00
钱涛 705f10f153 Merge remote-tracking branch 'origin/develop' into develop 2022-05-24 10:54:58 +08:00
钱涛 bccd246b2c fix分页异常 2022-05-24 10:54:46 +08:00
MustangDeng 78234f7554 工资单默认模板 2022-05-24 10:24:17 +08:00
MustangDeng 46a0b77611 Merge remote-tracking branch 'origin/develop' into develop 2022-05-23 13:39:08 +08:00
MustangDeng 5f2c20eaec 默认不启用非标功能 2022-05-23 13:38:48 +08:00
钱涛 d77e8b0de4 累计扣除字段 2022-05-20 14:41:42 +08:00
MustangDeng 6b9200121e 福利台账归档 2022-05-19 16:32:33 +08:00
MustangDeng 1f636c28d6 福利台账异动清单 2022-05-19 11:23:25 +08:00
MustangDeng 6024a69e84 福利档案导出 2022-05-19 10:20:23 +08:00
MustangDeng 0909e37741 数据采集高级搜索 2022-05-19 09:45:02 +08:00
MustangDeng 69246485ee 福利导入模板 2022-05-19 09:33:07 +08:00
MustangDeng f8105537c9 福利导入 2022-05-18 18:53:30 +08:00
MustangDeng 14daede3d0 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:37:34 +08:00
MustangDeng fcbc6c7202 福利方案分页创建 2022-05-18 16:37:23 +08:00
钱涛 647d4ae28b Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 16:08:13 +08:00
钱涛 bb66f80906 fix 新增系统薪资项目,模糊搜索 2022-05-18 16:07:51 +08:00
MustangDeng 51e5649dd8 Merge remote-tracking branch 'origin/develop' into develop 2022-05-18 14:36:46 +08:00
MustangDeng 604d3d453e 福利方案判断重复 2022-05-18 14:36:37 +08:00
钱涛 dc1c865a4b 账套项目删除bug 2022-05-18 14:34:06 +08:00
钱涛 27b04da333 Merge remote-tracking branch 'origin/develop' into develop 2022-05-16 17:04:19 +08:00
钱涛 a4c285dfd4 异常 2022-05-16 17:03:17 +08:00
MustangDeng 4bd082efb0 福利档案导出 2022-05-13 16:29:18 +08:00
钱涛 9540b0a2ce 自增bug 2022-05-13 11:27:25 +08:00
钱涛 022a78b659 Merge remote-tracking branch 'origin/develop' into develop 2022-05-13 11:22:18 +08:00
钱涛 282c0abc22 薪资项目不使用自增 2022-05-13 11:22:10 +08:00
MustangDeng ed9a9012ad Merge remote-tracking branch 'origin/develop' into develop 2022-05-13 10:32:06 +08:00
MustangDeng 0750ea0f51 福利档案列表报错问题 2022-05-13 10:31:51 +08:00
钱涛 e49bc9943f 薪酬核算第一步不使用线程池 2022-05-12 15:41:12 +08:00
钱涛 a2c59d15f4 项目分类bug 2022-05-12 14:36:16 +08:00
钱涛 83cc76ba77 个税扣缴义务人不存在提醒 2022-05-11 11:23:28 +08:00
钱涛 9dc5a396f2 Merge remote-tracking branch 'origin/develop' into develop 2022-05-10 17:27:10 +08:00