Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/View/default/Promote/mygrand.html

@@ -93,7 +93,7 @@
                       <?php else:?>
                       <a href="javascript:;" style="color: red;" class="cancel-shift-btn editbtn">取消换组</a>
                       <?php endif;?>
-                    <?php endif;?>
+
                       <?php if(in_array($vo['id'], $hasPlayerList)):?>
                         <?php if(!in_array($vo['id'], $hasShiftPlayerList)):?>
                         <a href="javascript:;" class="shift-player-btn editbtn">玩家迁移</a>
@@ -101,6 +101,7 @@
                         <a href="javascript:;" style="color: red;" class="cancel-shift-player-btn editbtn">取消玩家迁移</a>
                         <?php endif;?>
                       <?php endif;?>
+                    <?php endif;?>
                   </td>
                 </tr>
               </volist>