Merge branch 'main' of zentao/zentaopms (#1327)

2024-07-18 08:37:39 +08:00
parent 9183a860a2 a8d68a0c30
commit 5764ea38b6
1 changed files with 0 additions and 2 deletions
@@ -229,8 +229,6 @@ renderCell = function(result, {row, col})
        );
    }

-    if(typeof(row.data['field0_colspan']) != 'undefined') result[0] = row.data[col.name];
-
    return result;
 }