From 0caed17a984ea21a0b92478f52cf90c101d1085e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 七月 2024 16:08:38 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

---
 src/main/java/com/zy/asrs/controller/PlaController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 156da25..dc23bfc 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -229,7 +229,7 @@
             pla.setWeightAnfme(0.0);
             plaService.updateById(pla);
             SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
-                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
         });
 
         return R.ok();

--
Gitblit v1.9.1