diff --git a/public/react/src/modules/developer/components/controlSetting/index.js b/public/react/src/modules/developer/components/controlSetting/index.js
index 9c79e92e9..5d261445c 100644
--- a/public/react/src/modules/developer/components/controlSetting/index.js
+++ b/public/react/src/modules/developer/components/controlSetting/index.js
@@ -18,8 +18,7 @@ const { TabPane } = Tabs;
 const ControlSetting = (props) => {
 
   const {
-    hack,
-    userCode,
+    editor_code,
     inputValue,
     loading,
     submitLoading,
@@ -59,7 +58,7 @@ const ControlSetting = (props) => {
 
   // 调试代码
   const handleTestCode = (e) => {
-    if (!userCode) {
+    if (!editor_code) {
       notification.warning({
         message: '提示',
         description: '代码块内容不能为空'
@@ -78,7 +77,7 @@ const ControlSetting = (props) => {
   // 提交
   const handleSubmit = (e) => {
     e.preventDefault();
-    if (!userCode) {
+    if (!editor_code) {
       notification.warning({
         message: '提示',
         description: '代码块内容不能为空'
@@ -134,11 +133,17 @@ const ControlSetting = (props) => {
         <Button
           type="link"
           style={{ color: '#fff' }}
+<<<<<<< HEAD
         // onClick={handleShowControl}
         >
           控制台
              {/* <Icon type={ showTextResult ? "down" : "up" } /> */}
         </Button>
+=======
+        >
+          控制台
+          </Button>
+>>>>>>> 1b23635...  fix 提交代码与编辑代码不一致情况
         <p>
           <Button ghost
             loading={loading}
@@ -151,7 +156,10 @@ const ControlSetting = (props) => {
             type="primary"
             onClick={handleSubmit}
           >
+<<<<<<< HEAD
             {/* {props.identifier ? '更新' : '提交'} */}
+=======
+>>>>>>> 1b23635...  fix 提交代码与编辑代码不一致情况
             提交
         </Button>
         </p>
@@ -163,10 +171,14 @@ const ControlSetting = (props) => {
 const mapStateToProps = (state) => {
   const { commonReducer, ojForUserReducer } = state;
   const { loading, excuteState, submitLoading, showOrHideControl } = commonReducer;
+<<<<<<< HEAD
   const { commitTestRecordDetail, hack, userCode } = ojForUserReducer;
+=======
+  const { commitTestRecordDetail, hack, editor_code } = ojForUserReducer;
+>>>>>>> 1b23635...  fix 提交代码与编辑代码不一致情况
   return {
     hack,
-    userCode,
+    editor_code,
     loading,
     submitLoading,
     excuteState,
diff --git a/public/react/src/modules/developer/studentStudy/index.js b/public/react/src/modules/developer/studentStudy/index.js
index 8bb6c0411..2a588b034 100644
--- a/public/react/src/modules/developer/studentStudy/index.js
+++ b/public/react/src/modules/developer/studentStudy/index.js
@@ -108,18 +108,12 @@ function StudentStudy(props) {
   return (
     <div className={'student_study_warp'}>
       <div className={'student_study_header'}>
-        {/* <div className={'avator_nicker'}>
-          <img alt="用户头像" className={'student_img'} src={getImageUrl((mygetHelmetapi && mygetHelmetapi.nav_logo_url) || 'images/educoder/headNavLogo.png?1526520218')} />
-          <span className={'student_nicker'}>
-            {(mygetHelmetapi &&mygetHelmetapi.name) || ''}
-          </span>
-        </div> */}
+
         <UserInfo userInfo={userInfo} />
         <div className={'study_name'}>
           <span>{hack.name}</span>
         </div>
         <div className={'study_quit'}>
-          {/* to={`/problems/${_hack_id}/edit`} */}
           <span
             style={{ display: userInfo.hack_manager ? 'inline-block' : 'none' }}
             onClick={() => handleClickEditor(hack.identifier)}
@@ -127,16 +121,9 @@ function StudentStudy(props) {
           >
             <Icon type="form" className="quit-icon" /> 编辑
           </span>
-          {/* to="/problems" */}
           <span onClick={handleClickQuit} className="quit-btn">
             <Icon type="poweroff" className="quit-icon" /> 退出
           </span>
-          {/* <Button type="link" icon="form" className='quit-btn'>
-            <Link to="/problems">编辑</Link>
-          </Button>
-          <Button type="link" icon="poweroff" className='quit-btn'>
-            <Link to="/problems">退出</Link>
-          </Button> */}
         </div>
       </div>
       <div className="split-pane-area">
diff --git a/public/react/src/modules/developer/studentStudy/rightpane/index.js b/public/react/src/modules/developer/studentStudy/rightpane/index.js
index 62fc56783..c16aeca70 100644
--- a/public/react/src/modules/developer/studentStudy/rightpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/rightpane/index.js
@@ -114,9 +114,6 @@ const RightPane = (props) => {
         onClick={handleClickNote}
       ></span>
 
-      {/* <div className="student_notes">
-        <TextArea rows={5} />
-      </div> */}
       <div className={noteClazz}>
         <Form>
           <FormItem>
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index 1ce8dd849..85b384950 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -392,7 +392,7 @@ export const changeUserCodeTab = (key) => {
  */
 export const submitUserCode = (identifier, inputValue, type) => {
   return (dispatch, getState) => {
-    const { userCode, isUpdateCode, hack } = getState().ojForUserReducer;
+    const { editor_code, isUpdateCode, hack } = getState().ojForUserReducer;
 
     function userCodeSubmit() {
       fetchUserCodeSubmit(identifier).then(res => {
@@ -416,7 +416,7 @@ export const submitUserCode = (identifier, inputValue, type) => {
     }
     if (isUpdateCode) {
       fetchUpdateCode(identifier, {
-        code: Base64.encode(userCode)
+        code: Base64.encode(editor_code)
       }).then(res => {
         // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
         if (res.data.status === 401) {