From 0450b63bc615839bfee5fecff68c92ee811350d6 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Fri, 6 Sep 2019 14:52:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E6=B5=8B=E8=AF=95=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20190906062930_modify_is_test_for_user.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20190906062930_modify_is_test_for_user.rb

diff --git a/db/migrate/20190906062930_modify_is_test_for_user.rb b/db/migrate/20190906062930_modify_is_test_for_user.rb
new file mode 100644
index 000000000..f3f5bfd3b
--- /dev/null
+++ b/db/migrate/20190906062930_modify_is_test_for_user.rb
@@ -0,0 +1,5 @@
+class ModifyIsTestForUser < ActiveRecord::Migration[5.2]
+  def change
+    change_column :users, :is_test, :integer, :limit => 1
+  end
+end

From 10bb638ffe1c639fdad5d7f7d2b1ac6fa3bcabfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Sep 2019 15:00:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/elearning/Elearning.js    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/elearning/Elearning.js b/public/react/src/modules/courses/elearning/Elearning.js
index 2be9bd022..a1e28f672 100644
--- a/public/react/src/modules/courses/elearning/Elearning.js
+++ b/public/react/src/modules/courses/elearning/Elearning.js
@@ -359,23 +359,23 @@ class Elearning extends Component{
 
 						 {/*简介*/}
 
-								<div className="clearfix pl30 pr30" style={{paddingBottom:"22px"}}>
-									<div style={{textAlign: "left",marginTop:"10px",paddingBottom: "10px"}}>
-										<span className=" color-dark-21 " style={{textAlign: "center",fontSize:"19px"}}>简介</span>
-									</div>
-									<div  className="edu-back-white new_li  editormd-html-preview " >
-										<p className="markdown-body fonttext "  dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g,"▁▁▁")}}>
-										</p>
-									</div>
+								{/*<div className="clearfix pl30 pr30" style={{paddingBottom:"22px"}}>*/}
+								{/*	<div style={{textAlign: "left",marginTop:"10px",paddingBottom: "10px"}}>*/}
+								{/*		<span className=" color-dark-21 " style={{textAlign: "center",fontSize:"19px"}}>简介</span>*/}
+								{/*	</div>*/}
+								{/*	<div  className="edu-back-white new_li  editormd-html-preview " >*/}
+								{/*		<p className="markdown-body fonttext "  dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g,"▁▁▁")}}>*/}
+								{/*		</p>*/}
+								{/*	</div>*/}
 
-								</div>
+								{/*</div>*/}
 
 					</div>
 
 
 					<Spin size="large" spinning={isSpin}  id={"cdiv"}>
 
-						<div className=" clearfix" style={{marginTop:"20px"}}>
+						<div className=" clearfix" style={this.props.isAdmin()===true?{marginTop:"0px"}:{marginTop:"20px"}}>
 							{
 								stages===undefined||stages===JSON.stringify("[]")||stages.length===0?
 									<NoneData></NoneData>