From 921ed67368431c332b68450a0407b0bd151052c5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
index c42447f..4f06f63 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
@@ -4,7 +4,6 @@
import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MVarietyChange;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1312;
import com.ld.igds.sh.param.ApiRequest;
@@ -60,7 +59,7 @@
redisUtil.set(key, param.getEndTime());
//鏌ヨ娓╂箍搴︿俊鎭紝鍗崇伯鎯呬俊鎭�
- List<MVarietyChange> dataList = hApiShServiceImpl.listFoodVarietyChange(companyId,
+ List<InoutVarietyChange> dataList = hApiShServiceImpl.listFoodVarietyChange(companyId,
param.getDepotId(), startTime, param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
@@ -73,7 +72,7 @@
InteStatusLog log;
InteStatusLog addLog;
//灏佽鏁版嵁淇℃伅
- for (MVarietyChange variety : dataList) {
+ for (InoutVarietyChange variety : dataList) {
dto1312 = new Dto1312();
dto1312.setXzzbdbh(variety.getId());
dto1312.setHwbm(variety.getDepotId());
--
Gitblit v1.9.3