From 58a74d1b2944858b5b03e3c84b4b05ca02dd0545 Mon Sep 17 00:00:00 2001
From: yijiegong <sankejuzi@163.com>
Date: Tue, 8 Oct 2024 13:49:26 +0800
Subject: [PATCH] =?UTF-8?q?conInfoId=20=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java    | 3 +--
 .../ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
index 30993bbf..2940dd83 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
@@ -1,7 +1,6 @@
 package cn.ysk.cashier.cons.domain;
 
 import lombok.Data;
-import org.springframework.security.core.parameters.P;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -31,7 +30,7 @@ public class SuppFlow implements Serializable {
 
     @Data
     public static class ConInfos{
-        private Integer conInfold;
+        private Integer conInfoId;
 
         private BigDecimal price;
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
index cdf39717..c7f55926 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
@@ -1,7 +1,6 @@
 package cn.ysk.cashier.cons.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.ysk.cashier.cons.domain.*;
 import cn.ysk.cashier.cons.repository.TbConsInfoFlowRepository;
 import cn.ysk.cashier.cons.repository.TbConsInfoRepository;
@@ -39,7 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.util.*;
 
@@ -235,7 +233,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
         for (SuppFlow.ConInfos conInfos : resources.getList()) {
             JSONObject object = new JSONObject();
 
-            TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfold());
+            TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfoId());
             if (Objects.isNull(info)) {
                 log.info("耗材信息不存在");
                 continue;