From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 60b87ac..410d9cc 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -416,8 +416,10 @@
      */
     @PostMapping(value = "/update")
     @ResponseBody
-    public Object update( Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,String redemptionInstructions,String cover,String productImages,Integer sort){
+    public Object update(String name, Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,
+                          String redemptionInstructions,String cover,String productImages,Integer sort){
         Map<String, Object> stringObjectHashMap = new HashMap<>();
+        stringObjectHashMap.put("name",name);
         stringObjectHashMap.put("pointMerchandiseId",pointMerchandiseId);
         stringObjectHashMap.put("quantityIssued",quantityIssued);
         stringObjectHashMap.put("pickUpQuantity",pickUpQuantity);

--
Gitblit v1.7.1