Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/product/service/ProdGroupService.java

@@ -50,7 +50,7 @@ public interface ProdGroupService extends IService<ProdGroup> {
      *
      * @param id 商品分组ID
      */
-    void deleteProdGroup(Long id);
+    void deleteProdGroup(Long shopId, Long id);
 
     /**
      * 更新商品分组
@@ -64,13 +64,13 @@ public interface ProdGroupService extends IService<ProdGroup> {
      *
      * @param id 商品分组ID
      */
-    void disableProdGroup(Long id);
+    void disableProdGroup(Long shopId, Long id);
 
     /**
      * 启用商品分组
      *
      * @param id 商品分组ID
      */
-    void enableProdGroup(Long id);
+    void enableProdGroup(Long shopId, Long id);
 
 }