Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/product/ProductController.java

@@ -39,9 +39,9 @@ public class ProductController {
         return SysResult.success();
     }
 
-    @DeleteMapping("delete/{barCode}")
+    @DeleteMapping("delete/{id}")
-    public SysResult deleteProduct(@PathVariable String barCode){
+    public SysResult deleteProduct(@PathVariable String id){
-        productService.deleteProduct(barCode);
+        productService.deleteProduct(id);
         return SysResult.success();
     }
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/product/ProductService.java

@@ -16,7 +16,7 @@ public interface ProductService {
 
     void updataProduct(Product product);
 
-    void deleteProduct(String barCode);
+    void deleteProduct(String id);
 
     List<Storehouse> getStorehouse();
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/service/product/ProductServiceImpl.java

@@ -129,9 +129,9 @@ public class ProductServiceImpl implements ProductService {
     }
 
     @Override
-    public void deleteProduct(String barCode) {
+    public void deleteProduct(String id) {
         Map<String,Object> map = new HashMap<>();
-        map.put("bar_code",barCode);
+        map.put("id",id);
         productMapper.deleteByMap(map);
     }