Merge branch 'ol_12_30' into online

src/components/save-form/index.vue

@@ -89,6 +89,9 @@ export default {
   /deep/ .el-input__inner{
     width: 180px;
   }
+  /deep/.el-date-editor.el-input{
+    width: 180px;
+  }
   /deep/ .el-form-item__content .el-col {
     width: 180px;
   }

src/views/teamDetail/componentClass/calenderStudentList.vue

@@ -134,7 +134,7 @@ export default {
       obj.studentIds = this.studentIds;
       try {
         const reset = await spanGroupMergeClassSplitClassAffirm(obj);
-        this.$message.success("合并成功");
+        this.$message.success(reset.msg);
         // 1.关闭弹窗
         // 2.清空合并班
         // 3.刷新列表