Merge remote-tracking branch 'origin/main'

src/main/java/com/hivekion/room/bean/BattleRootTask.java

@@ -177,6 +177,9 @@ public class BattleRootTask extends AbtParentTask  {
             jsonObject.put("teamLat",teamLat);
             jsonObject.put("teamLng",teamLng);
             sendConsumeMsg.setData(jsonObject);
+            sendConsumeMsg.setRoom(roomId);
+            sendConsumeMsg.setScenarioId(scenarioTask.getScenarioId());
+            sendConsumeMsg.setCmdType("battleConsume");
             Global.sendCmdInfoQueue.add(sendConsumeMsg);
             BattleConsume battleConsume = new BattleConsume();
             battleConsume.setLat(teamLat);