From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/common/CoreDicService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java b/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java
index c3aea26..e52ccbc 100644
--- a/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java
+++ b/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java
@@ -7,7 +7,7 @@
 import com.ld.igds.common.dto.PosDto;
 import com.ld.igds.data.BaseParam;
 import com.ld.igds.data.Page;
-import com.ld.igds.models.DicFoodOrigin;
+import com.ld.igds.models.DicArea;
 import com.ld.igds.models.DicSlogan;
 
 /**
@@ -58,12 +58,12 @@
      */
     void delPosByBizId(PosDto posDto);
 
+
     /**
-     * 鍒嗛〉鏌ヨ绮浜у湴淇℃伅
-     *
+     * 鑾峰彇琛屾斂鍖哄垝
      * @param param
      * @return
      */
-    Page<DicFoodOrigin> pageFoodLocation(BaseParam param);
+    List<DicArea> listDicArea(Page<DicArea> page,BaseParam param);
 
 }
\ No newline at end of file

--
Gitblit v1.9.3