Merge branch 'ol_12_30' into test

src/views/teamBuild/signupList.vue

@@ -293,7 +293,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="总金额"
+                  label="收费金额"
                   prop="totalAmount"
                   align="center"
                 >
@@ -332,7 +332,7 @@
                 v-permission="'musicGroup/updateExpectedStudentNum'"
                 style="margin-right: 20px; margin-top: 20px"
               >
-              <p style="color:red">总金额:{{allSubjectTotal|moneyFormat}}元</p>
+              <p style="color:red">收费总额:{{allSubjectTotal|moneyFormat}}元</p>
                 <el-button
                   v-show="
                     !isEdit &&

src/views/teamDetail/componentCourse/studentWork.vue

@@ -62,12 +62,12 @@
         ></el-table-column>
         <el-table-column
           align="center"
-          prop="createTime"
+          prop="submitTime"
           width="150"
-          label="交训练时间"
+          label="提交训练时间"
         >
           <template slot-scope="scope">
-            <div>{{ scope.row.createTime | dateForMinFormat }}</div>
+            <div>{{ scope.row.submitTime | dateForMinFormat }}</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="isView" label="是否提交">