From 9498d9a510d5ef7b46eaf2a4f77b2feb9ae30387 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 25 Dec 2023 10:31:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into yy_dev

# Conflicts:
#	cweb/src/main/java/com/cweb/controller/TestController.java
#	service/src/main/java/com/hfkj/unipush/UniPushService.java
---
 .../main/java/com/cweb/controller/group/OpenGroupController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cweb/src/main/java/com/cweb/controller/group/OpenGroupController.java b/cweb/src/main/java/com/cweb/controller/group/OpenGroupController.java
index ec2ecf0..00e36f0 100644
--- a/cweb/src/main/java/com/cweb/controller/group/OpenGroupController.java
+++ b/cweb/src/main/java/com/cweb/controller/group/OpenGroupController.java
@@ -7,6 +7,7 @@ import com.hfkj.common.exception.SysCode;
 import com.hfkj.common.utils.CoordCommonUtil;
 import com.hfkj.common.utils.ResponseMsgUtil;
 import com.hfkj.entity.*;
+
 import com.hfkj.service.group.BsStoreGroupProductService;
 import com.hfkj.service.group.BsStoreGroupService;
 import com.hfkj.model.OpenStoreModel;