From 62d4c522ae452b3cb583a02982156047172230a2 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 28 五月 2024 08:29:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 43de35c..f0f05a5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -204,7 +204,7 @@
list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
}
- return R.ok().add(pics);
+ return R.ok().add(list);
}
}
--
Gitblit v1.9.1