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
11 months ago · 9498d9a510
parent ea35f8d545
commit 9498d9a510
1 changed files with 1 additions and 0 deletions
--- 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;