From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java b/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
index 8acebed..df9bc38 100644
--- a/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
+++ b/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
@@ -9,9 +9,8 @@
import com.ld.igds.data.Page;
import com.ld.igds.data.PageResponse;
import com.ld.igds.grain.dto.GrainData;
-import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.models.Depot;
-import com.ld.igds.models.DicFoodOrigin;
+import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSysConf;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.FilesUtil;
@@ -131,18 +130,17 @@
}
/**
- * 鍑哄叆搴撲腑-绮浜у湴
+ * 鑾峰彇琛屾斂鍖哄煙
*
- * @param param 鏌ヨ鍏抽敭瀛楀彲浠ユ槸ID涔熷彲鑳芥槸鍚嶇О
* @return
*/
- @RequestMapping("/page-food-location")
- public PageResponse<Page<DicFoodOrigin>> pageFoodLocation(
- @RequestBody InoutParam param) {
+ @RequestMapping("/page-dicArea")
+ public PageResponse<Page<DicArea>> pageDicArea(@RequestBody BaseParam param) {
- return commonManager.pageFoodLocation(param);
+ Page<DicArea> list = commonManager.pageDicArea(param);
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, list);
}
-
/**
* 甯姪椤甸潰璺宠浆
*
--
Gitblit v1.9.3