junru0303
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,047 Commits 56 Branches 0 Tags 287 MiB
Commit Graph

1047 Commits

Author SHA1 Message Date
zhangmu aa7125abd1 Merge pull request '专家评审子系统' (#320) from durian/forgeplus-react:expert_review into dev_military_osredm 2021-12-16 12:00:27 +08:00
谢思 bf58961a23 专家评审子系统 2021-12-16 10:54:06 +08:00
zhangmu a560159a63 Merge pull request '初始化专家评审模块' (#317) from tongChong/forgeplus-react:dev_military_osredm into dev_military_osredm 2021-12-14 13:31:29 +08:00
何童崇 3ecae5ba43 初始化专家评审模块 2021-12-14 13:27:27 +08:00
baladiwei 846a24aef4 Merge pull request 'merge after release' (#309) from pre_dev_military into dev_military 2021-12-08 13:48:40 +08:00
baladiwei 955eed9232 Merge pull request '修改创客删除与恢复' (#308) from tongChong/forgeplus-react:dev-jk-maker into pre_dev_military 2021-12-08 13:47:48 +08:00
何童崇 1bad39e83a 修改创客删除与恢复 2021-11-25 15:59:04 +08:00
何童崇 c9e7da7df3 优化调用地址引用 2021-11-25 11:40:57 +08:00
何童崇 7f0b770dca 修改创客，优化创客调用Java发送请求的接口 2021-11-25 11:26:59 +08:00
baladiwei 70536036e1 Merge pull request 'merge after release' (#283) from pre_dev_military into dev_military 2021-11-25 09:33:40 +08:00
baladiwei 0f92ff94a0 Merge pull request '修改公告页面bug' (#280) from tongChong/forgeplus-react:hotfix_api_address into pre_dev_military 2021-11-23 14:46:40 +08:00
何童崇 6507c87bc8 Merge branch 'dev_military' of https://git.trustie.net/Gitlink/forgeplus-react into hotfix_api_address 2021-11-22 15:13:36 +08:00
何童崇 b423e4b7e7 修改公告页面bug 2021-11-22 14:58:34 +08:00
baladiwei 938be1da55 Merge pull request 'merge after release' (#278) from pre_dev_military into dev_military 2021-11-22 11:28:48 +08:00
何童崇 162fd200a5 修改创客管理员发布的问题 2021-11-11 10:40:57 +08:00
baladiwei d9bd0387db Merge pull request '修改API调用指向路径及发布任务时的判断逻辑' (#254) from tongChong/forgeplus-react:hotfix_api_address into pre_dev_military 2021-11-10 15:04:28 +08:00
何童崇 c0cfe12db4 修改发布任务判断逻辑 2021-11-10 14:57:42 +08:00
何童崇 c3ecbe1f97 修改调用路径后未加跨域参数的问题 2021-11-10 10:39:08 +08:00
何童崇 a59a8c3693 修改指向路径 2021-11-10 09:33:12 +08:00
baladiwei 97f62a5684 Merge pull request 'pre-release merge' (#104) from pre_dev_military into dev_military 2021-09-30 17:46:56 +08:00
baladiwei e74a3b6a95 Merge pull request '解决合并时未先pull源代码合并记录的问题' (#103) from tongChong/forgeplus-react:dev-jk-maker into pre_dev_military 2021-09-30 17:46:00 +08:00
何童崇 38878183d5 Merge branch 'dev_military' of https://git.trustie.net/Gitlink/forgeplus-react into dev-jk-maker 2021-09-30 17:40:05 +08:00
baladiwei 0e0c13f1a4 Merge pull request '修改创客延期和项目侧边栏' (#100) from tongChong/forgeplus-react:dev-jk-maker into pre_dev_military 2021-09-30 17:35:59 +08:00
何童崇 a667a32de0 修改任务状态展示问题 2021-09-30 17:06:33 +08:00
何童崇 230e597787 修改延期的问题 2021-09-30 16:50:19 +08:00
何童崇 f0ea3a53c4 修改延期的问题 2021-09-30 16:08:48 +08:00
何童崇 51a4680481 优化延期、侧边导航 2021-09-30 11:49:44 +08:00
baladiwei 61a4882e58 Merge pull request '修改创客的调用' (#81) from tongChong/forgeplus-react:dev-jk-maker into pre_dev_military 2021-09-27 11:04:38 +08:00
何童崇 148e8f91eb 上传佐证材料查询参数修改 2021-09-27 10:53:05 +08:00
baladiwei 8f52a091fa Merge pull request '查看加密公告-电话验证错误提示语句' (#80) from tongChong/forgeplus-react:dev_military_notice into pre_dev_military 2021-09-27 10:45:43 +08:00
tongChong 62eabdf7c0 Merge pull request '修改加密公告电话验证的var' (#31) from durian/forgeplus-react:dev_military_notice_xiesi into dev_military_notice 2021-09-27 10:42:01 +08:00
谢思 d5490d5e71 修改加密公告电话验证的var 2021-09-27 10:28:47 +08:00
baladiwei cef374c52d Merge pull request '查看加密公告-电话验证错误提示语句' (#79) from tongChong/forgeplus-react:dev_military_notice into dev_military 2021-09-27 10:26:32 +08:00
谢思 7be60d3140 Merge branch 'dev_military' of https://git.trustie.net/Gitlink/forgeplus-react into dev_military_notice_xiesi 2021-09-27 10:18:29 +08:00
durian feafa5b6f3 Merge pull request '查看加密公告-电话验证错误提示语句' (#30) from durian/forgeplus-react:dev_military_notice_xiesi into dev_military_notice 2021-09-27 10:14:06 +08:00
谢思 2dd6ed108f 查看加密公告-电话验证错误提示语句 2021-09-27 10:11:59 +08:00
baladiwei 969323fdde Merge pull request '修改跳转的小bug' (#78) from tongChong/forgeplus-react:dev-jk-maker into pre_dev_military 2021-09-27 09:38:34 +08:00
何童崇 a73b4ff79a 修改跳转的小bug 2021-09-26 20:39:46 +08:00
baladiwei 16ca2a359e Merge pull request 'pre-release merge' (#77) from pre_dev_military into dev_military 2021-09-26 18:42:07 +08:00
baladiwei 444d954e72 Merge pull request '新增创客空间功能' (#76) from tongChong/forgeplus-react:dev-jk-maker into pre_dev_military 2021-09-26 18:41:08 +08:00
何童崇 6fc31c0bb8 拆分，不同功能调用不同的API，暂时用个简易版后续优化 2021-09-26 18:31:01 +08:00
何童崇 cf73f72e19 Merge branch 'pre_dev_military' of https://git.trustie.net/Gitlink/forgeplus-react into dev-jk-maker 2021-09-26 15:11:39 +08:00
baladiwei 745a25a003 Merge pull request '查看加密公告--电话验证' (#75) from tongChong/forgeplus-react:dev_military_notice into pre_dev_military 2021-09-26 15:11:01 +08:00
tongChong b080df1449 Merge pull request '查看加密信息-电话验证' (#28) from durian/forgeplus-react:dev_military_notice_xiesi into dev_military_notice 2021-09-26 14:28:59 +08:00
何童崇 0aa2a4aec3 允许跨域传cookie 2021-09-26 14:23:26 +08:00
何童崇 4dc1c4c814 合并公告的修改 2021-09-26 10:53:20 +08:00
何童崇 ddc576b054 上传创客issue修改 2021-09-26 10:25:06 +08:00
谢思 caef7a0ab3 查看加密公告--电话验证 2021-09-22 14:59:09 +08:00
谢思 85f0578302 查看加密公告--电话验证 2021-09-22 14:55:02 +08:00
baladiwei bff55b6810 Merge pull request '修改指向路径' (#69) from tongChong/forgeplus-react:dev_military_notice into dev_military 2021-09-17 16:33:19 +08:00