Commit Graph

2737 Commits

Author SHA1 Message Date
tongChong 2f43ff82d0 Merge pull request '修改图标' (#414) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-07-01 20:52:27 +08:00
何童崇 016718f3e2 修改图标 2022-07-01 20:50:19 +08:00
tongChong 386a0efe85 Merge pull request '去掉ccks作品驳回按钮' (#413) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-07-01 16:24:57 +08:00
何童崇 18dc164cc2 去掉ccks作品驳回按钮 2022-07-01 16:23:12 +08:00
tongChong 4c0fe27dac Merge pull request '为创客大赛临时调整创客空间' (#412) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-07-01 15:36:10 +08:00
何童崇 c6e1f7126d 为创客大赛临时调整创客空间 2022-07-01 15:31:35 +08:00
tongChong ac573c6e25 Merge pull request 'ccks排行榜' (#410) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-07-01 11:14:07 +08:00
何童崇 0c8de16bf9 ccks排行榜 2022-07-01 11:08:09 +08:00
何童崇 45dde95b5f 修改ccks提案提交 2022-06-30 17:19:36 +08:00
何童崇 b5198b1673 Merge branch 'dev_military_admin' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_admin 2022-06-27 09:18:07 +08:00
何童崇 bf822e763d 优化竞赛,回归相应issue 2022-06-27 09:12:38 +08:00
xxq250 268e0698f3 Merge pull request '修改提案提交文字' (#404) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-06-23 22:35:04 +08:00
何童崇 cba1db6c3d 修改提案提交文字 2022-06-23 22:02:29 +08:00
何童崇 83d97b3a1c 回归管理页面issue 2022-06-21 15:36:38 +08:00
xxq250 57892ff98e Merge pull request '修改首页通知弹框' (#398) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-06-15 11:18:08 +08:00
何童崇 843c49c3a5 Merge branch 'pre_dev_military' of http://106.75.45.236:3000/Gitlink/forgeplus-react into dev_military_admin 2022-06-15 11:13:27 +08:00
何童崇 611366e6af 修改首页通知弹框 2022-06-15 11:12:47 +08:00
xxq250 1347c01176 Merge pull request '修改全局消息通知' (#395) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-06-10 10:20:00 +08:00
何童崇 3f602dacb7 修改全局消息通知 2022-06-10 10:07:57 +08:00
何童崇 139dfdf7cd 修改图片工具函数 2022-06-08 11:33:42 +08:00
xxq250 4536144561 Merge pull request '修改启智图片、弹框等' (#392) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-06-07 11:36:45 +08:00
何童崇 9031da23be Merge branch 'pre_dev_military' of http://106.75.45.236:3000/Gitlink/forgeplus-react into dev_military_admin 2022-06-07 11:29:36 +08:00
何童崇 b0a35d973d 修改启智图片 2022-06-07 11:07:41 +08:00
xxq250 fa57794270 Merge pull request '新版后台管理' (#390) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military 2022-06-01 10:41:39 +08:00
何童崇 2d2ce3b833 后台管理侧边导航栏展开逻辑调整 2022-06-01 10:22:35 +08:00
何童崇 867a864348 后台管理优化 2022-05-31 11:49:34 +08:00
何童崇 6ad0070c4d Merge branch 'pre_dev_military' of http://106.75.45.236:3000/Gitlink/forgeplus-react into dev_military_admin 2022-05-30 14:59:20 +08:00
xxq250 81864a0a55 Merge pull request 'ccks相关issue修改' (#389) from tongChong/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-05-30 14:44:44 +08:00
何童崇 1a80db81cf Merge branch 'pre_dev_military' of http://106.75.45.236:3000/Gitlink/forgeplus-react into dev_military_qz2022 2022-05-26 09:00:01 +08:00
何童崇 e2915a7b05 修改issue 2022-05-26 08:54:34 +08:00
xxq250 f43b902eb9 Merge pull request '增加竞赛报名映射字段' (#382) from tongChong/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-05-25 17:02:36 +08:00
何童崇 ab0eaa520b 增加b报名映射字段 2022-05-25 16:59:55 +08:00
xxq250 cc4309f6b5 Merge pull request 'ccks竞赛' (#381) from tongChong/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-05-25 16:32:59 +08:00
何童崇 5511912765 Merge branch 'pre_dev_military' of http://106.75.45.236:3000/Gitlink/forgeplus-react into dev_military_qz2022 2022-05-25 15:49:47 +08:00
何童崇 76c90faab5 修改ccks的issue 2022-05-25 15:36:14 +08:00
何童崇 16f16c7183 ccks改造 2022-05-24 17:22:43 +08:00
何童崇 d8c06883b4 定制化竞赛路由动态化1.0 2022-05-19 14:42:31 +08:00
xxq250 146541acbd Merge pull request '增加竞赛弹框,修改上传报名表' (#375) from tongChong/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-05-16 17:08:22 +08:00
何童崇 4a56895be2 增加竞赛弹框,修改上传报名表 2022-05-16 16:54:30 +08:00
何童崇 2d54110047 修改跳转路由 2022-05-13 17:21:21 +08:00
何童崇 018244c368 上传路由修改示例代码 2022-05-13 16:23:12 +08:00
何童崇 4b4ac537c0 竞赛动态加载初始化 2022-05-13 15:31:56 +08:00
何童崇 d14d9ba630 修改后台管理代码 2022-05-13 14:29:30 +08:00
xxq250 2da1a838d4 Merge pull request '启智2022修改' (#369) from durian/forgeplus-react:dev_military_qz2022 into pre_dev_military 2022-05-06 10:52:50 +08:00
谢思 ddb39a65fc 启智竞赛增加logo 2022-05-05 17:46:22 +08:00
谢思 b88dbfa36f Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022 2022-05-05 14:01:53 +08:00
谢思 283180c7ec upload action修改 2022-04-29 17:49:08 +08:00
何童崇 91681b4cea 修改高度 2022-04-29 12:05:28 +08:00
谢思 5c00e6fbea 微调样式 2022-04-29 11:28:33 +08:00
何童崇 d6b02e83f7 修改竞赛后台管理代码 2022-04-29 09:18:12 +08:00