FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
525 Commits 2 Branches 0 Tags
7afd6f37ccd3d7f9c5fd2bbc66cd892d45b2fc22
Commit Graph
525 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaokaiyao@91isoft.com 7afd6f37cc Merge remote-tracking branch 'origin/FOTON' into develop 
# Conflicts:
#	src/main/resources/application.yml
 2022-01-14 15:37:22 +08:00
zhaokaiyao@91isoft.com 195a26ccfe 恢复我的.java文件 2022-01-14 15:28:25 +08:00
zhaokaiyao@91isoft.com efbad17f67 Revert "政策征求意见流程" 
This reverts commit ac0055ae
 2022-01-14 15:28:25 +08:00
zhaokaiyao@91isoft.com 0f4d0121d3 commit 2022-01-14 15:28:25 +08:00
Superman_Main 9031326540 feat: There is no way the 2022-01-14 15:28:25 +08:00
Superman_Main 4b1fc38969 feat: There is no way the 2022-01-14 15:28:25 +08:00
2510220824 f726ac195d update：福田生产环境配置 2022-01-14 15:28:24 +08:00
super_liu 6c050ba6cf Merge branch 'develop' into FOTON 2022-01-14 14:22:44 +08:00
super_liu fbb82976ad feat: There is no way the, 2022-01-14 14:21:40 +08:00
super_liu 612bedc6b3 Merge branch 'develop' into FOTON 2022-01-11 22:59:07 +08:00
super_liu 9cef46040b Merge remote-tracking branch 'origin/develop' into develop 2022-01-11 22:56:11 +08:00
super_liu 4fd2c5fdb8 feat: There is no way the, buss2 2022-01-11 22:55:26 +08:00
yuezhihang 3a4bfe373f 参会流程 bug修复 2022-01-11 16:50:08 +08:00
yuezhihang 78430da00e 标准化活动 丢失的代码找回 2022-01-11 10:58:32 +08:00
yuezhihang 6f9f6cb555 Merge remote-tracking branch 'origin/develop' into develop 2022-01-11 10:06:42 +08:00
yuezhihang 412acedf02 全状态数据保存 2022-01-11 10:06:28 +08:00
super_liu b4b1e02c58 Merge branch 'develop' into FOTON 2022-01-10 23:25:27 +08:00
super_liu d9e95721df Merge remote-tracking branch 'origin/develop' into develop 2022-01-10 23:24:26 +08:00
super_liu 9cecf33eb2 feat: There is no way the, 2022-01-10 23:24:11 +08:00
yuezhihang afaad3f69e 公开征求意见流程 新需求实现 2022-01-10 18:26:45 +08:00
yuezhihang 239c723a83 征求意见流程 bug修复 2022-01-10 14:53:58 +08:00
yuezhihang 3527a1bdc0 征求意见流程自选审核领导并去重 需求变更实现！ 2022-01-10 14:51:31 +08:00
王夏晖 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