解决冲突

2025-12-25 02:32:54 +08:00 · 2023-02-26 01:01:57 +08:00
parent 9e1f010d9f
commit ed3c9c2336
1 changed files with 0 additions and 4 deletions
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3747,12 +3747,8 @@ export default defineComponent({
      state.cstm_hs = true;
      state.kk_eidt = true;
    };
-<<<<<<< HEAD
-    const columnFun = () => {
-=======
    const columnFun = (itm) => {
      console.log("itm", itm);
->>>>>>> 2c0ee70d8d8b2d087356a3f9c9a352e1440cef1b
      //新加
      state.stuColumns = [
        {