From f17fff6114be4556dda0ee22c7f05e7274852a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Mar 2020 00:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newOrEditTask/leftpane/editorTab/AddTestDemo.js  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
index d7b0aafe3..4ed7dee24 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
@@ -1,7 +1,7 @@
 /*
  * @Description: 添加测试用例
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-11-21 09:19:38
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 10:37:41
@@ -127,7 +127,7 @@ const AddTestDemo = (props) => {
    * 文本输入框可编辑的情况
    *  1. 新增时
    *  2. isAdd 为 false 且 isEditor 为true 时
-   * @param {*} testCase 
+   * @param {*} testCase
    */
   // const isDisabled = (testCase) => {
   //   return !testCase.isAdd && !isEditor;
@@ -151,9 +151,13 @@ const AddTestDemo = (props) => {
         <Form>
           <FormItem
             label={<span className={'label_text'}>输入</span>}
+<<<<<<< HEAD
             validateStatus={testCaseValidate.input.validateStatus}
             help={testCaseValidate.input.errMsg}
             colon={false}
+=======
+            colon={ false }
+>>>>>>> 8f5b1de... 题库地址
           >
             <TextArea
               rows={5}
@@ -164,9 +168,13 @@ const AddTestDemo = (props) => {
           </FormItem>
           <FormItem
             label={<span className={'label_text'}>输出</span>}
+<<<<<<< HEAD
             validateStatus={testCaseValidate.output.validateStatus}
             help={testCaseValidate.output.errMsg}
             colon={false}
+=======
+            colon={ false }
+>>>>>>> 8f5b1de... 题库地址
           >
             <TextArea
               rows={5}