Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend

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

@@ -194,6 +194,8 @@ public class BattleRootTask extends AbtParentTask  {
             battleConsume.setMedical(medicalConsume);
             battleConsume.setWater(waterConsume);
             battleConsume.setResourceId(scenarioTask.getResourceId());
+            LocalDateTime currentDateTime = new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            battleConsume.setConsumeDate(currentDateTime);
             battleConsumeService.save(battleConsume);
           }catch (Exception ex){
             ex.printStackTrace();

src/main/java/com/hivekion/scenario/entity/BattleConsume.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -46,6 +48,8 @@ public class BattleConsume implements Serializable {
 
     private String lng;
 
+    private LocalDateTime consumeDate;
+
     public String getId() {
         return id;
     }
@@ -62,7 +66,13 @@ public class BattleConsume implements Serializable {
         this.resourceId = resourceId;
     }
 
+    public LocalDateTime getConsumeDate() {
+        return consumeDate;
+    }
 
+    public void setConsumeDate(LocalDateTime consumeDate) {
+        this.consumeDate = consumeDate;
+    }
 
     public Integer getDeath() {
         return death;