Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun

2022-11-30 15:19:30 +08:00
parent b1831623e5 6aafddee29
commit f90d78b40e
1 changed files with 1 additions and 1 deletions
@@ -31,7 +31,7 @@ function getConflictStories(planID)
            if(!result)
            {
                newBranch = oldBranch[planID];
-                $('#branch').val(oldBranch[planID]);
+                $('#branch').val(oldBranch[planID].split(','));
                $('#branch').trigger("chosen:updated");
            }
        }