From c5314aba8cd24ac192117b709f79209376cb9e9c Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 14:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E5=8D=83=E4=B8=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 28 +++++++++----------
 .../java/com/muyu/domain/DataMillion.java     |  1 +
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2d28ae7..66d906a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,18 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d7f9db40-65da-4834-b29d-bbe0bd94d010" name="更改" comment="天气预警">
-      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/DataMillionController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/mapper/DataMillionMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/DataMillionService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/DataMillionServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/cloud-port-server/src/main/resources/mapper/DataMillionMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/controller/MarketController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/MarketService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/java/com/muyu/cloud/mart/service/impl/MarketServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cloud-port-server/src/main/resources/mapper/MarketMappers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-port-server/src/main/resources/mapper/MarketMapper.xml" afterDir="false" />
-    </list>
+    <list default="true" id="d7f9db40-65da-4834-b29d-bbe0bd94d010" name="更改" comment="两千万数据框架" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -149,7 +138,7 @@
       <workItem from="1725345043314" duration="1792000" />
       <workItem from="1725350762294" duration="4960000" />
       <workItem from="1725380326630" duration="2900000" />
-      <workItem from="1725415396368" duration="2602000" />
+      <workItem from="1725415396368" duration="3489000" />
     </task>
     <task id="LOCAL-00001" summary="初始化">
       <option name="closed" value="true" />
@@ -391,7 +380,15 @@
       <option name="project" value="LOCAL" />
       <updated>1725350926810</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="两千万数据框架">
+      <option name="closed" value="true" />
+      <created>1725423093550</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1725423093550</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -404,7 +401,8 @@
     <MESSAGE value="生辰" />
     <MESSAGE value="邮编查询" />
     <MESSAGE value="天气预警" />
-    <option name="LAST_COMMIT_MESSAGE" value="天气预警" />
+    <MESSAGE value="两千万数据框架" />
+    <option name="LAST_COMMIT_MESSAGE" value="两千万数据框架" />
   </component>
   <component name="XDebuggerManager">
     <pin-to-top-manager>
diff --git a/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java b/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
index a252df3..58e1929 100644
--- a/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
+++ b/cloud-port-common/src/main/java/com/muyu/domain/DataMillion.java
@@ -15,4 +15,5 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DataMillion {
+    private Long id;
 }