Commit Graph
547 Commits
Author SHA1 Message Date
super_liu bfdec5f365 Merge branch 'develop' into FOTON 2022-01-27 22:43:01 +08:00
super_liu f95be065de Merge remote-tracking branch 'origin/develop' into develop 2022-01-27 22:37:15 +08:00
super_liu 53566a3b73 feat: There is no way the, 2022-01-27 22:37:03 +08:00
yuezhihang 86677a81d5 标准评估 多项目组 2022-01-27 14:09:32 +08:00
super_liu d38de3b0b4 Merge branch 'develop' into FOTON 2022-01-27 08:29:31 +08:00
yuezhihang 91c8fcb364 标准合规评估流程 单线正想跑通 无整改 功能 2022-01-26 20:39:08 +08:00
super_liu dbd1b3245e Merge branch 'develop' into FOTON 2022-01-23 19:50:57 +08:00
super_liu 20d4e72512 Merge remote-tracking branch 'origin/develop' into develop 2022-01-22 16:05:30 +08:00
super_liu f379654096 feat: There is no way the, 2022-01-22 16:05:08 +08:00
super_liu b5f9764c23 Merge branch 'develop' into FOTON 2022-01-22 08:30:54 +08:00
yuezhihang f33db34621 Merge remote-tracking branch 'origin/develop' into develop 2022-01-21 19:15:49 +08:00
yuezhihang c841c116e7 公开征求意见bug修复 2022-01-21 19:15:41 +08:00
super_liu cf4e089751 Merge branch 'develop' into FOTON 2022-01-20 20:45:44 +08:00
super_liu eef6df51fc feat: There is no way the, 2022-01-20 17:43:21 +08:00
super_liu da24ac8597 Merge branch 'develop' into FOTON 2022-01-19 17:41:21 +08:00
super_liu 2876861262 feat: There is no way the, 2022-01-19 17:35:50 +08:00
super_liu de6ef58127 Merge branch 'develop' into FOTON 2022-01-18 19:36:01 +08:00
super_liu 0d8bbf2c3a Merge remote-tracking branch 'origin/develop' into develop 2022-01-18 16:24:08 +08:00
super_liu d7faeff45f feat: There is no way the,plan lxd 2022-01-18 16:23:47 +08:00
yuezhihang d2c919dd71 调研流程 bug修复 2022-01-18 11:08:53 +08:00
super_liu 03d2c66f37 Merge branch 'develop' into FOTON 2022-01-16 20:39:04 +08:00
super_liu 34e25b84dc feat: There is no way the 2022-01-16 20:38:16 +08:00
super_liu 0996bbad8d Merge branch 'develop' into FOTON
# Conflicts:
#	src/main/resources/application.yml
2022-01-16 20:32:25 +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