修复冲突

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -611,7 +611,7 @@ public class ViewUtil {
         PayEntity payEntity = new PayEntity();
         payEntity.setGame_id(gameId);
         payEntity.setGame_name(gameName);
-        showGamePayAccount(activity,payEntity);
+        newInstance().showGamePayAccount(activity,payEntity);
     }
     public void showGamePayAccount(Activity activity,PayEntity payEntity){
         new DialogPayAccount(activity,payEntity).showPayaccount();