Commit Graph

185 Commits

Author SHA1 Message Date
zyy239969 63ab58093b up 2023-07-20 23:09:00 +08:00
zyy239969 b5770e4b11 up 2023-07-20 23:02:57 +08:00
zhuyy 5e4d683e88 update 2023-07-20 17:31:09 +08:00
zhuyy 6cf13d7c03 update 2023-07-20 15:53:41 +08:00
zhuyy f1eaea8fe0 前端打包 2023-07-20 14:14:41 +08:00
zhuyy 4fe9de70ae 导出 2023-07-20 14:13:04 +08:00
lijiaqi c2b1dff5cf update 2023-07-17 14:24:45 +08:00
lijiaqi 98639d297b update 2023-07-17 14:24:32 +08:00
lijiaqi 1bc34bee11 update 2023-07-17 14:23:59 +08:00
lijiaqi 7fa7ef5fe1 update 2023-07-14 14:52:37 +08:00
lijiaqi 4a1abd4c24 update 2023-07-12 16:36:59 +08:00
lijiaqi 239002ea79 update 2023-07-12 16:23:33 +08:00
mash 1ffdfcc71c update 人事审批相关前端代码 2023-06-25 10:06:22 +08:00
mash 128374bc10 update 人事审批相关2.1 2023-06-25 10:01:33 +08:00
mash eb0e421014 update 人事审批相关2 2023-06-25 09:57:18 +08:00
zhuyy d756a79241 update 2023-06-21 17:28:54 +08:00
mash fb30a7257f update 人事审批相关01 2023-06-21 16:21:11 +08:00
mash 5f92ddae7a update 人事审批相关01 2023-06-21 16:15:12 +08:00
mash 68964e2461 update 人事审批相关 2023-06-21 15:10:55 +08:00
zhuyy 7ecdfaf63a 修改 2023-06-21 14:51:16 +08:00
zhuyy ec30d25fe1 修改 2023-06-21 13:51:37 +08:00
zhuyy b8651bb3b8 修改 2023-06-19 14:53:14 +08:00
zhuyy 2246904236 修改指标,登记,董监 2023-06-16 17:32:13 +08:00
zhuyy 1a7a1ce696 修改指标,登记 2023-06-16 15:11:52 +08:00
mash e956b22dcb update 1.0 2023-06-16 15:09:56 +08:00
zhuyy 72ff161ca6 修改指标,登记 2023-06-16 15:04:29 +08:00
lijiaqi ab5b421bf1 update 2023-06-15 17:10:34 +08:00
lijiaqi bef79707ff update 2023-06-15 15:26:33 +08:00
lijiaqi 91592146a4 update 2023-06-15 14:26:03 +08:00
lijiaqi aa97d4fa65 update 2023-06-13 14:08:51 +08:00
lijiaqi 04178c4d38 update 2023-06-13 14:08:13 +08:00
lijiaqi f5a7076b91 update 2023-05-30 17:24:00 +08:00
mash a3bb75cdbe update view 2023-05-06 14:57:15 +08:00
lijiaqi 61aa88ce41 OA板块整合与实现 2023-05-05 14:57:59 +08:00
lijiaqi a9254f42e9 OA板块整合与实现 2023-03-06 16:19:12 +08:00
lijiaqi 5c6d551d8a OA板块整合与实现 2023-02-24 17:05:20 +08:00
zhuyy 559023e1ce 打包 2023-02-24 16:32:14 +08:00
mash 609ba9cd7d update 2023-02-24 15:24:53 +08:00
lijiaqi a675032257 OA板块整合与实现 2023-02-24 14:32:34 +08:00
mash 6d43ef7938 附件数据回显调整 2023-02-24 13:52:08 +08:00
zhuyy 0ca3a8266b update 2023-02-24 13:20:35 +08:00
mash 8272cd7324 bug修改2.2 2023-02-24 11:02:30 +08:00
mash 81671e21cd bug修改2.0 2023-02-24 09:28:50 +08:00
zhuyy 765676b2fe update 2023-02-23 17:37:30 +08:00
mash b3fece6fc3 bug修改1.01 2023-02-23 17:11:27 +08:00
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 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
lijiaqi db927245cf 配置修改 2023-02-09 16:58:44 +08:00
mash 9642903945 update 人员 2023-02-09 16:32:39 +08:00
zhuyy ed9dee7a0d update 2023-02-09 15:26:39 +08:00
mash 2aeccffe1b update 人员查询 2023-02-09 11:14:50 +08:00
lijiaqi 83f65acfb3 岗位 2023-02-09 10:53:53 +08:00
lijiaqi 7d6aacc3f3 Merge remote-tracking branch 'origin/master' 2023-02-09 10:53:21 +08:00
lijiaqi 69c319eaf1 岗位 2023-02-09 10:53:09 +08:00
mash 50ad66db8e 变更记录表修改 2023-02-09 10:46:03 +08:00