From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java b/screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java
index 25a46ac..5806675 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SecondCruiserSort.java
@@ -3,8 +3,9 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.moral.util.DateUtils;
+
 
 /**
  * Description //todo
@@ -41,5 +42,11 @@
      */
     private String  time;
 
+    /**
+     * ���������
+     */
+    @TableField(exist = false)
+    private Double avg;
+
 
 }

--
Gitblit v1.8.0