Commit Graph

147 Commits

Author SHA1 Message Date
zhuyy 20d94bfbfb update 2023-02-23 16:34:47 +08:00
mash 9b620cb9db bug修改 2023-02-23 16:29:26 +08:00
lijiaqi 21eaa2d4ed Merge remote-tracking branch 'origin/master' 2023-02-23 15:54:29 +08:00
lijiaqi b6a55e5534 OA板块整合与实现 2023-02-23 15:54:20 +08:00
mash ec2c86e7fe 人事报表导出 2023-02-23 14:37:07 +08:00
lijiaqi 0cee91d90a OA板块整合与实现 2023-02-23 14:04:23 +08:00
lijiaqi e770567b9b OA板块整合与实现 2023-02-23 13:36:55 +08:00
lijiaqi 172e3520e0 OA板块整合与实现 2023-02-23 11:26:02 +08:00
朱义勇 8a9252d227 Update DirectorsSupervisorsController.java 2023-02-23 02:15:17 +00:00
zhuyy 3a6c90069a update 2023-02-23 10:12:12 +08:00
zhuyy 59f90ca9a0 update 2023-02-22 17:54:20 +08:00
mash 62c729fa9e 人员选调审核1.0 2023-02-22 17:32:51 +08:00
mash cfdf59fd4b 人员变更审核 2023-02-22 14:59:29 +08:00
mash 588830390a 审核改动 2023-02-22 13:53:03 +08:00
lijiaqi 31a2f3ede5 配置修改 2023-02-22 10:30:47 +08:00
lijiaqi fd58500d2e 配置修改 2023-02-22 10:30:35 +08:00
lijiaqi b45df12779 配置修改 2023-02-21 17:41:45 +08:00
lijiaqi 6c389deb84 配置修改 2023-02-21 17:36:11 +08:00
lijiaqi 221f120e72 配置修改 2023-02-21 17:26:16 +08:00
lijiaqi 22ec35aae4 Merge remote-tracking branch 'origin/master' 2023-02-21 17:22:48 +08:00
lijiaqi 0ec7f512ae 配置修改 2023-02-21 17:22:39 +08:00
zhuyy 66ce0bda91 update 2023-02-21 16:21:45 +08:00
zhuyy 8bbd3177c6 招聘董监审批 2023-02-21 15:57:42 +08:00
mash 14a302a050 人员审批及前端代码 2023-02-21 14:35:47 +08:00
mash b71f22c0d6 人事信息查询表改动1.01 2023-02-21 09:00:55 +08:00
mash 395908cc11 人事信息查询表改动 2023-02-20 15:26:24 +08:00
mash f4f9c84fba 人事信息查询表 2023-02-20 15:21:13 +08:00
zhuyy 013afd73fc 报表 2023-02-20 14:29:11 +08:00
mash c6643ee103 审批数据改动 2023-02-20 13:30:40 +08:00
mash ecc71b73a5 审批流程及审批日志1.1 2023-02-17 14:49:12 +08:00
mash 30e1eba3af 审批流程 2023-02-16 17:20:12 +08:00
lijiaqi 46384229a5 配置修改 2023-02-16 17:17:04 +08:00
zhuyy f51825a164 update 2023-02-16 16:30:13 +08:00
zhuyy 0373ee87f2 前端打包 2023-02-15 16:20:54 +08:00
lijiaqi 85da7ed448 Merge remote-tracking branch 'origin/master' 2023-02-15 11:46:05 +08:00
lijiaqi 89680a017a 配置修改 2023-02-15 11:45:54 +08:00
mash 039d6429b3 根据参数只导出指定列 2023-02-15 11:42:19 +08:00
zhuyy 669e023adf update 2023-02-14 16:56:34 +08:00
mash 4f0b6463d5 导入导出 2023-02-14 15:36:30 +08:00
zhuyy b1a25a0d9f update 2023-02-14 10:20:10 +08:00
zhuyy b36e958ace Merge remote-tracking branch 'origin/master' 2023-02-13 13:25:53 +08:00
mash d47ae79c48 修改 2023-02-13 10:24:46 +08:00
zhuyy b3ec0947d3 Merge remote-tracking branch 'origin/master' 2023-02-13 09:01:23 +08:00
mash 7484078098 高级查询相关修改 2023-02-10 17:52:56 +08:00
zhuyy dacef7ad56 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/ydool/staff/controller/OrganizationController.java
2023-02-10 17:48:28 +08:00
zhuyy 0d01a569cd update 2023-02-10 17:47:33 +08:00
mash afef212818 附件相关修改 2023-02-10 13:55:45 +08:00
zhuyy 0b36cd1492 Merge remote-tracking branch 'origin/master' 2023-02-09 17:11:23 +08:00
zhuyy 19a3f82ac4 update 2023-02-09 17:11:16 +08:00
lijiaqi 796e2688ce Merge remote-tracking branch 'origin/master' 2023-02-09 16:58:53 +08:00