From 0e0bb650ec20be91b06278ad2b4711b1b0b45294 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 18 十月 2021 15:31:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java
index 9647d1e..da6d46b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseApplyServiceImpl.java
@@ -72,7 +72,7 @@
                 comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonates.getSurplusQuantity()-comActWarehouseApply1.getGoodsNum());
                 this.comActWarehouseDonatesDao.updateById(comActWarehouseDonates);
                 ComActWarehouseOperation comActWarehouseOperation=new ComActWarehouseOperation();
-                comActWarehouseOperation.setGoodsId(comActWarehouseApply.getGoodsId());
+                comActWarehouseOperation.setGoodsId(comActWarehouseApply1.getGoodsId());
                 comActWarehouseOperation.setCreateTime(new Date());
                 comActWarehouseOperation.setType(ComActWarehouseOperation.type.xs);
                 comActWarehouseOperation.setApplyId(comActWarehouseApply.getId());

--
Gitblit v1.7.1