From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java
index ff03a9b..5d97c50 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActWarehouseApplyApi.java
@@ -105,6 +105,7 @@
         }
         if(comActWarehouseApply.getStatus().equals(ComActWarehouseApplyVO.status.ylq)){
             comActWarehouseApply.setActualTime(new Date());
+            comActWarehouseApply.setWriteOffUserId(this.getUserId());
         }
         return this.communityService.comActWarehouseApplyUpdate(comActWarehouseApply);
     }

--
Gitblit v1.7.1