fix:解决合并代码的冲突

a7e01f18 · yuananting · 2e25320f · 14642d42 · a7e01f18
Commit a7e01f18 authored Aug 02, 2021 by yuananting
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/modules/task-center/train-task/components/TrainContent.jsx
+1 -1

No files found.
--- a/src/modules/task-center/train-task/components/TrainContent.jsx
+++ b/src/modules/task-center/train-task/components/TrainContent.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-07-30 16:33:58
 * @LastEditors: yuananting
- * @LastEditTime: 2021-08-02 11:13:55
+ * @LastEditTime: 2021-08-02 11:14:47
 * @Description: 任务中心-培训任务-新建-培训内容
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有