From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突

---
 server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
index 539054a..287a867 100644
--- a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
@@ -67,7 +67,7 @@
      *
      * @param id 瀹炰綋瀵硅薄
      */
-    void updateStatusByIds(Integer id,Integer status);
+    void updateStatusById(Integer id,Integer status);
 
     /**
      * 涓婚敭鏇存柊

--
Gitblit v1.9.3