diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/CollectedFoodAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/CollectedFoodAdapter.kt
index 8364d07..2850332 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/CollectedFoodAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/CollectedFoodAdapter.kt
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.databinding.ListItemCollectedFoodBinding
-import com.shuwei.dish.match.entity.CollectedFoodItem
+import com.shuwei.dish.match.model.CollectedFoodItem
 
 /**
  * 已采集食材列表适配器
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/Food2Adapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/Food2Adapter.kt
index d9bc60a..f004b67 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/Food2Adapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/Food2Adapter.kt
@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.databinding.ListItemFood2Binding
-import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.model.FoodRecord
 
 /**
  * 菜品搜索页面的适配器
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/Food3Adapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/Food3Adapter.kt
index dfdebf4..a321be5 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/Food3Adapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/Food3Adapter.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.databinding.ListItemFood3Binding
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 
 /**
  * 向量采集页面的适配器
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/FoodAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/FoodAdapter.kt
index c17abb3..6325d50 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/FoodAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/FoodAdapter.kt
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemFoodBinding
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
 import com.shuwei.dish.match.utils.ext.visible
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt
index 0c2d4fd..3c1bc34 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemFoodListBinding
-import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.model.FoodRecord
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
 import java.text.DecimalFormat
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/FoodMaterialAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/FoodMaterialAdapter.kt
index ed918d8..e692a90 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/FoodMaterialAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/FoodMaterialAdapter.kt
@@ -9,7 +9,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemFoodMaterialBinding
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
 import com.shuwei.dish.match.utils.ext.visible
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/HomeModeAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/HomeModeAdapter.kt
index 233651d..c117ac5 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/HomeModeAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/HomeModeAdapter.kt
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemHomeModeBinding
-import com.shuwei.dish.match.entity.HomeModeBean
+import com.shuwei.dish.match.model.HomeModeBean
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
 
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningSearchAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningSearchAdapter.kt
index 39c8b16..930ddb9 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningSearchAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningSearchAdapter.kt
@@ -8,7 +8,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemSeasoningBinding
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 
 /**
  * 调料搜索弹窗适配器
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/VectorCollectionAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/VectorCollectionAdapter.kt
index 13dd6b7..e2e8930 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/VectorCollectionAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/VectorCollectionAdapter.kt
@@ -9,7 +9,7 @@ import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemVectorCollectionBinding
-import com.shuwei.dish.match.entity.FoodCollectionBean
+import com.shuwei.dish.match.model.FoodCollectionBean
 import com.shuwei.dish.match.utils.ext.load
 
 class VectorCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
diff --git a/app/src/main/java/com/shuwei/dish/match/db/AppDatabase.kt b/app/src/main/java/com/shuwei/dish/match/db/AppDatabase.kt
index d295e5b..8f21ec4 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/AppDatabase.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/AppDatabase.kt
@@ -10,10 +10,10 @@ import com.shuwei.dish.match.db.dao.CookFoodDao
 import com.shuwei.dish.match.db.dao.CookFoodGoodsDao
 import com.shuwei.dish.match.db.dao.SeasoningDao
 import com.shuwei.dish.match.db.dao.SeasoningSlotDao
-import com.shuwei.dish.match.entity.CookFoodEntity
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
 
 
 // 步骤1：更新版本号
diff --git a/app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt b/app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt
index 8dfd781..a545d91 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt
@@ -1,10 +1,10 @@
 package com.shuwei.dish.match.db
 
 import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.entity.CookFoodEntity
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/app/src/main/java/com/shuwei/dish/match/db/DbViewModel.kt b/app/src/main/java/com/shuwei/dish/match/db/DbViewModel.kt
index b8b364e..b87141c 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/DbViewModel.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/DbViewModel.kt
@@ -2,12 +2,12 @@ package com.shuwei.dish.match.db
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.shuwei.dish.match.entity.CollectedFoodItem
-import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.model.CollectedFoodItem
+import com.shuwei.dish.match.db.entity.CookFoodEntity
 import com.shuwei.dish.match.objbox.ObjectBox
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
diff --git a/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodDao.kt b/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodDao.kt
index f95f148..2c27f8b 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodDao.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodDao.kt
@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodEntity
 
 @Dao
 interface CookFoodDao {
diff --git a/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodGoodsDao.kt b/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodGoodsDao.kt
index 136362f..6df26c2 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodGoodsDao.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodGoodsDao.kt
@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
 
 @Dao
 interface CookFoodGoodsDao {
diff --git a/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningDao.kt b/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningDao.kt
index df98acc..fa9eee9 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningDao.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningDao.kt
@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
 
 @Dao
 interface SeasoningDao {
diff --git a/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningSlotDao.kt b/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningSlotDao.kt
index 512be8d..38df78c 100644
--- a/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningSlotDao.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningSlotDao.kt
@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
 
 /**
  * 调料槽位配置 DAO
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodEntity.kt b/app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodEntity.kt
similarity index 96%
rename from app/src/main/java/com/shuwei/dish/match/entity/CookFoodEntity.kt
rename to app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodEntity.kt
index f0deeb7..d084da3 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodEntity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodEntity.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.entity
 
 import androidx.room.Entity
 import androidx.room.Ignore
@@ -31,4 +31,4 @@ data class CookFoodEntity(
     var foodConstituteList: MutableList<CookFoodGoodsEntity>? = null
 
     constructor() : this(foodId = "") // 必需的空构造
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt b/app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodGoodsEntity.kt
similarity index 96%
rename from app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt
rename to app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodGoodsEntity.kt
index 79f0547..c358c3e 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/entity/CookFoodGoodsEntity.kt
@@ -1,8 +1,9 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.shuwei.dish.match.db.BaseEntity
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.utils.DateTimeUtil
 import java.io.Serializable
 import java.time.LocalDateTime
@@ -94,4 +95,4 @@ class CookFoodGoodsEntity(
         goodsOrRelationCode = goodsOrRelationCode,
         rawMaterialsType = rawMaterialsType
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/SeasoningEntity.kt b/app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningEntity.kt
similarity index 97%
rename from app/src/main/java/com/shuwei/dish/match/entity/SeasoningEntity.kt
rename to app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningEntity.kt
index 7d13025..52fcecc 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/SeasoningEntity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningEntity.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
@@ -72,4 +72,4 @@ var isDel: Int = 0,
     var createTime: String = DateTimeUtil.formatDateTime(LocalDateTime.now())
 ) : BaseEntity {
     constructor() : this(goodsId = "") // 必需的空构造
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/SeasoningSlotEntity.kt b/app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningSlotEntity.kt
similarity index 94%
rename from app/src/main/java/com/shuwei/dish/match/entity/SeasoningSlotEntity.kt
rename to app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningSlotEntity.kt
index 08d06b0..cad577e 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/SeasoningSlotEntity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/db/entity/SeasoningSlotEntity.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.entity
 
 import androidx.room.Entity
 
diff --git a/app/src/main/java/com/shuwei/dish/match/dialog/FoodSearchDialog.kt b/app/src/main/java/com/shuwei/dish/match/dialog/FoodSearchDialog.kt
index 92c54a6..e877bf9 100644
--- a/app/src/main/java/com/shuwei/dish/match/dialog/FoodSearchDialog.kt
+++ b/app/src/main/java/com/shuwei/dish/match/dialog/FoodSearchDialog.kt
@@ -26,7 +26,7 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.databinding.DialogFoodSearchBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
 import com.shuwei.dish.match.dialog.SeasoningSelectDialog.Companion.PAGE_SIZE
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.utils.KeyboardUtil
 import com.shuwei.dish.match.utils.buildMockGoodsList
diff --git a/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt b/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
index 0f2341c..5441452 100644
--- a/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
+++ b/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
@@ -24,7 +24,7 @@ import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.databinding.DialogSeasoningSelectBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.utils.KeyboardUtil
 import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/CollectedFoodItem.kt b/app/src/main/java/com/shuwei/dish/match/model/CollectedFoodItem.kt
similarity index 85%
rename from app/src/main/java/com/shuwei/dish/match/entity/CollectedFoodItem.kt
rename to app/src/main/java/com/shuwei/dish/match/model/CollectedFoodItem.kt
index 0e4e296..72c33e8 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/CollectedFoodItem.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/CollectedFoodItem.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
 /**
  * 已采集食材列表项数据模型
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodDTO.kt b/app/src/main/java/com/shuwei/dish/match/model/CookFoodDTO.kt
similarity index 89%
rename from app/src/main/java/com/shuwei/dish/match/entity/CookFoodDTO.kt
rename to app/src/main/java/com/shuwei/dish/match/model/CookFoodDTO.kt
index dd889f3..d89059a 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodDTO.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/CookFoodDTO.kt
@@ -1,5 +1,7 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
 import java.io.Serializable
 
 /**
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsDTO.kt b/app/src/main/java/com/shuwei/dish/match/model/CookFoodGoodsDTO.kt
similarity index 96%
rename from app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsDTO.kt
rename to app/src/main/java/com/shuwei/dish/match/model/CookFoodGoodsDTO.kt
index 58cc988..8e493c1 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsDTO.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/CookFoodGoodsDTO.kt
@@ -1,5 +1,7 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
 import java.io.Serializable
 
 /**
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/DataBean.kt b/app/src/main/java/com/shuwei/dish/match/model/DataBean.kt
similarity index 97%
rename from app/src/main/java/com/shuwei/dish/match/entity/DataBean.kt
rename to app/src/main/java/com/shuwei/dish/match/model/DataBean.kt
index 099124c..e4c41fa 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/DataBean.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/DataBean.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
 import android.graphics.Bitmap
 import android.net.Uri
@@ -50,5 +50,3 @@ data class FoodCollectionBean(
         return result
     }
 }
-
-
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt b/app/src/main/java/com/shuwei/dish/match/model/FoodRecord.kt
similarity index 93%
rename from app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt
rename to app/src/main/java/com/shuwei/dish/match/model/FoodRecord.kt
index 2a0220f..8882dd0 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/FoodRecord.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
 import java.io.Serializable
 
@@ -17,4 +17,3 @@ data class FoodRecord(
     var isOriginalData: Boolean = true,
     var sort: Int = 0
 ) : Serializable
-
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/GoodsItem.kt b/app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
similarity index 94%
rename from app/src/main/java/com/shuwei/dish/match/entity/GoodsItem.kt
rename to app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
index 240e19e..05eda21 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/GoodsItem.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/GoodsItem.kt
@@ -1,5 +1,7 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
 import java.io.Serializable
 
 /**
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/GoodsNameQueryDTO.kt b/app/src/main/java/com/shuwei/dish/match/model/GoodsNameQueryDTO.kt
similarity index 88%
rename from app/src/main/java/com/shuwei/dish/match/entity/GoodsNameQueryDTO.kt
rename to app/src/main/java/com/shuwei/dish/match/model/GoodsNameQueryDTO.kt
index ef12e7e..8e93628 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/GoodsNameQueryDTO.kt
+++ b/app/src/main/java/com/shuwei/dish/match/model/GoodsNameQueryDTO.kt
@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.model
 
 /**
  * 物品名称批量查询入参 DTO
diff --git a/app/src/main/java/com/shuwei/dish/match/net/ApiService.kt b/app/src/main/java/com/shuwei/dish/match/net/ApiService.kt
index d25ae7a..79bb69a 100644
--- a/app/src/main/java/com/shuwei/dish/match/net/ApiService.kt
+++ b/app/src/main/java/com/shuwei/dish/match/net/ApiService.kt
@@ -1,9 +1,9 @@
 package com.shuwei.dish.match.net
 
 import com.shuwei.dish.match.base.GlobalData
-import com.shuwei.dish.match.entity.CookFoodDTO
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.CookFoodDTO
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Body
diff --git a/app/src/main/java/com/shuwei/dish/match/net/NetViewModel.kt b/app/src/main/java/com/shuwei/dish/match/net/NetViewModel.kt
index 24c0a14..3c72767 100644
--- a/app/src/main/java/com/shuwei/dish/match/net/NetViewModel.kt
+++ b/app/src/main/java/com/shuwei/dish/match/net/NetViewModel.kt
@@ -3,10 +3,10 @@ package com.shuwei.dish.match.net
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.entity.CookFoodDTO
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.GoodsItem
-import com.shuwei.dish.match.entity.GoodsNameQueryDTO
+import com.shuwei.dish.match.model.CookFoodDTO
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
+import com.shuwei.dish.match.model.GoodsNameQueryDTO
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/java/com/shuwei/dish/match/net/RemoteRepository.kt b/app/src/main/java/com/shuwei/dish/match/net/RemoteRepository.kt
index ea9f035..25d6026 100644
--- a/app/src/main/java/com/shuwei/dish/match/net/RemoteRepository.kt
+++ b/app/src/main/java/com/shuwei/dish/match/net/RemoteRepository.kt
@@ -1,8 +1,8 @@
 package com.shuwei.dish.match.net
 
-import com.shuwei.dish.match.entity.CookFoodDTO
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.CookFoodDTO
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/CollectedFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/CollectedFoodActivity.kt
index ea8cb86..2634b7c 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/CollectedFoodActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/CollectedFoodActivity.kt
@@ -19,7 +19,7 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.databinding.ActivityCollectedFoodBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.CollectedFoodItem
+import com.shuwei.dish.match.model.CollectedFoodItem
 import com.shuwei.dish.match.utils.KeyboardUtil
 import com.shuwei.dish.match.utils.ext.appendText
 import com.shuwei.dish.match.utils.ext.buildSpannableString
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/FoodRecognizeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/FoodRecognizeActivity.kt
index 6cc8181..032d1f8 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/FoodRecognizeActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/FoodRecognizeActivity.kt
@@ -12,8 +12,8 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.databinding.ActivityFoodRecognizeBinding
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.dialog.FoodSearchDialog
-import com.shuwei.dish.match.entity.GoodsItem
-import com.shuwei.dish.match.entity.GoodsNameQueryDTO
+import com.shuwei.dish.match.model.GoodsItem
+import com.shuwei.dish.match.model.GoodsNameQueryDTO
 import com.shuwei.dish.match.utils.ActivityManager
 import com.shuwei.dish.match.utils.AddressUtil
 import com.shuwei.dish.match.utils.WeightUtil
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt
index 3bd8164..a150c86 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt
@@ -14,7 +14,7 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityFoodSearchBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
-import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.model.FoodRecord
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.utils.KeyboardUtil
 import com.shuwei.dish.match.utils.SpTool
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
index 6a25f08..6618797 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
@@ -10,7 +10,7 @@ import com.shuwei.dish.match.adapter.HomeModeAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityHomeBinding
-import com.shuwei.dish.match.entity.HomeModeBean
+import com.shuwei.dish.match.model.HomeModeBean
 import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/PrepareFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/PrepareFoodActivity.kt
index ccaa2f0..67688c2 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/PrepareFoodActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/PrepareFoodActivity.kt
@@ -19,10 +19,10 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.databinding.ActivityPrepareFoodBinding
 import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.CookFoodDTO
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.CookFoodDTO
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.objbox.FoodModule
 import com.shuwei.dish.match.utils.AddressUtil
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt
index 061614c..957afb5 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt
@@ -17,7 +17,7 @@ import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySamplingModeBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.model.FoodRecord
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.utils.DateTimeUtil
 import com.shuwei.dish.match.utils.ext.dp
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt
index dc23d94..f6bd3ce 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SlaveActivity.kt
@@ -21,7 +21,7 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.GlobalData
 import com.shuwei.dish.match.databinding.ActivitySlaveBinding
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
 import com.shuwei.dish.match.scale.ScaleData
 import com.shuwei.dish.match.scale.ScaleDeviceConfig
 import com.shuwei.dish.match.scale.ScaleServiceManager
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
index 9249f2e..56952f0 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
@@ -17,10 +17,10 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySubmitFoodBinding
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.CookFoodEntity
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.toDTO
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.toDTO
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.scale.ScaleDeviceConfig
 import com.shuwei.dish.match.scale.ScaleServiceManager
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
index df98551..3103959 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
@@ -16,8 +16,8 @@ import com.shuwei.dish.match.base.BaseFragment
 import com.shuwei.dish.match.databinding.FragmentFoodListBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.CookFoodEntity
-import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.model.FoodRecord
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.ui.CookingModeActivity
 import com.shuwei.dish.match.ui.PrepareFoodActivity
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt
index a67ed2f..892417f 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/SeasoningConfigFragment.kt
@@ -19,7 +19,7 @@ import com.shuwei.dish.match.base.GlobalData
 import com.shuwei.dish.match.databinding.FragmentSeasoningConfigBinding
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.dialog.SeasoningSelectDialog
-import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
 import com.shuwei.dish.match.scale.ScaleDeviceConfig
 import com.shuwei.dish.match.scale.ScaleEvent
 import com.shuwei.dish.match.scale.ScaleServiceManager
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/VectorCollectionFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/VectorCollectionFragment.kt
index afb6f08..3021d27 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/VectorCollectionFragment.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/VectorCollectionFragment.kt
@@ -32,8 +32,8 @@ import com.shuwei.dish.match.databinding.FragmentVectorCollectionBinding
 import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
 import com.shuwei.dish.match.dialog.Loading
-import com.shuwei.dish.match.entity.FoodCollectionBean
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.FoodCollectionBean
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.objbox.Food
 import com.shuwei.dish.match.objbox.FoodModule
diff --git a/app/src/main/java/com/shuwei/dish/match/utils/ImageUploader.kt b/app/src/main/java/com/shuwei/dish/match/utils/ImageUploader.kt
index d06d21d..40a9b1a 100644
--- a/app/src/main/java/com/shuwei/dish/match/utils/ImageUploader.kt
+++ b/app/src/main/java/com/shuwei/dish/match/utils/ImageUploader.kt
@@ -1,6 +1,6 @@
 package com.shuwei.dish.match.utils
 
-import com.shuwei.dish.match.entity.FoodCollectionBean
+import com.shuwei.dish.match.model.FoodCollectionBean
 import java.util.concurrent.atomic.AtomicInteger
 
 class ImageUploader(
diff --git a/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt b/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
index 4c905ec..a9272fe 100644
--- a/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
+++ b/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
@@ -8,7 +8,7 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.model.GoodsItem
 import com.shuwei.dish.match.utils.ext.dp
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.toast