Commit Graph
503 Commits
Author SHA1 Message Date
王夏晖 1b59038cbb Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!92
2022-01-07 15:52:13 +08:00
super_liu 19ba1578c2 Merge remote-tracking branch 'origin/develop' into develop 2022-01-07 15:41:36 +08:00
super_liu 983f896b30 feat: There is no way the, 2022-01-07 15:41:15 +08:00
王夏晖 15c7798a89 Merge branch 'develop' into 'FOTON'
未符合项整改

See merge request foton-wkflow-group/foton-wkflow-rest!91
2022-01-07 13:29:59 +08:00
yuezhihang 803ca23719 未符合项整改 2022-01-07 10:50:40 +08:00
super_liu 6990726953 Merge branch 'develop' into FOTON 2022-01-06 20:26:41 +08:00
super_liu b4667922fc Merge remote-tracking branch 'origin/develop' into develop 2022-01-06 17:57:46 +08:00
super_liu f4bf45b24d feat: There is no way the, 2022-01-06 17:57:27 +08:00
yuezhihang d604243e85 Merge remote-tracking branch 'origin/develop' into develop 2022-01-06 17:45:40 +08:00
yuezhihang 0214800c61 解读流程 驳回bug修复 2022-01-06 17:45:23 +08:00
super_liu 203e45e3b4 Merge branch 'develop' into FOTON 2022-01-06 17:21:45 +08:00
super_liu fe10071aaa feat: There is no way the 2022-01-06 17:21:22 +08:00
super_liu 67d61aff44 Merge branch 'develop' into FOTON 2022-01-06 17:20:00 +08:00
super_liu 373d80f126 Merge remote-tracking branch 'origin/FOTON' into FOTON 2022-01-06 17:19:27 +08:00
super_liu 14141938a5 feat: There is no way the, 2022-01-06 17:18:12 +08:00
王夏晖 0798886bd9 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!90
2022-01-06 15:34:30 +08:00
super_liu 3251abd371 Merge remote-tracking branch 'origin/develop' into develop 2022-01-06 13:48:35 +08:00
super_liu a42587384c feat: There is no way the, 2022-01-06 13:48:22 +08:00
super_liu b25ed9f6fc Merge branch 'develop' into FOTON 2022-01-05 21:29:13 +08:00
yuezhihang ffa06028c9 参会流程 bug修复 2022-01-05 13:36:02 +08:00
王夏晖 d4b14b6558 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!89
2022-01-04 16:44:53 +08:00
super_liu 9d22f721f7 feat: There is no way the, 2022-01-04 16:21:01 +08:00
super_liu 6a489613c2 Merge remote-tracking branch 'origin/develop' into develop 2022-01-04 15:42:31 +08:00
super_liu ed7eb3e0a1 feat: There is no way the, 2022-01-04 15:42:13 +08:00
yuezhihang 866224fd95 工作组显示状态和流程联动 2022-01-04 13:56:59 +08:00
王夏晖 217def1be8 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!88
2021-12-31 16:13:22 +08:00
yuezhihang 82fb2cb733 解读流程改名字 2021-12-31 16:08:44 +08:00
yuezhihang 5cba7463f1 征求意见bug修复!!! 2021-12-31 15:18:39 +08:00
王夏晖 2e47c39f61 Merge branch 'develop' into 'FOTON'
调研流程bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!87
2021-12-30 19:33:54 +08:00
yuezhihang 9679f27a4f 调研流程bug修复 2021-12-30 19:33:30 +08:00
王夏晖 06776dc52c Merge branch 'develop' into 'FOTON'
征求意见bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!86
2021-12-30 19:32:23 +08:00
yuezhihang 87f95ef6ee 征求意见bug修复 2021-12-30 18:30:46 +08:00
王夏晖 dd6398b702 Merge branch 'develop' into 'FOTON'
调研流程bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!85
2021-12-30 17:17:12 +08:00
yuezhihang 970f4468a9 调研流程bug修复 2021-12-30 17:15:35 +08:00
王夏晖 2e3eacaa3d Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!84
2021-12-30 14:39:25 +08:00
super_liu 8a718ff5b5 Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 14:01:48 +08:00
super_liu 9af93b357e feat: There is no way the,buss node 7 reject and prcName update 2021-12-30 13:58:06 +08:00
yuezhihang 29d5dfdaea 解读流程bug修复 2021-12-30 10:59:09 +08:00
super_liu 13fe5ff97b Merge branch 'develop' into FOTON 2021-12-29 21:52:05 +08:00
yuezhihang 50e1d94dbf 企标制修订计划立项 2021-12-29 20:25:58 +08:00
yuezhihang a6a87dc3f3 解读流程 可能存在的bug 已写日志:::!!!! 2021-12-29 20:16:50 +08:00
yuezhihang 1c0985438c 上传调研结果步骤 保存审批意见去除 2021-12-29 17:30:20 +08:00
yuezhihang 841951b8a5 解读流程未走完出现完成时间bug修复 2021-12-29 17:21:00 +08:00
yuezhihang b953b9ee2b 企标制修订计划管控---最新的 立项 取消 合并 修改 2021-12-29 16:07:15 +08:00
王夏晖 24d7b2cd85 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!83
2021-12-29 11:31:12 +08:00
yuezhihang 26f45780b7 解决项目评估 分发问题 2021-12-29 11:30:35 +08:00
yuezhihang 316b7ce8d2 解读流程入库数据消失问题 修复 2021-12-29 10:43:17 +08:00
super_liu 00c89052f5 Merge branch 'develop' into FOTON 2021-12-29 05:09:56 +08:00
yuezhihang 9c9ba499ab 项目评估驳回无数据问题修复 2021-12-28 20:03:10 +08:00
yuezhihang 13b1df2fbd Merge remote-tracking branch 'origin/develop' into develop 2021-12-28 17:07:05 +08:00