Commit 91377f18 by yuananting

fix:解决冲突

parent 732761b3
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Description: * @Description:
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-19 18:05:23 * @Date: 2021-03-19 18:05:23
* @LastEditors: zangsuyun * @LastEditors: yuananting
* @LastEditTime: 2021-04-08 11:29:12 * @LastEditTime: 2021-04-15 21:46:41
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -202,7 +202,7 @@ class Classification extends Component { ...@@ -202,7 +202,7 @@ class Classification extends Component {
<Button <Button
onClick={() => { onClick={() => {
window.RCHistory.push({ window.RCHistory.push({
pathname: "/question-category-manage?from=knowledge", pathname: "/course-category-manage?from=knowledge",
}); });
}} }}
> >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment