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

cweb/src/main/java/com/cweb/controller/group/OpenGroupController.java

@@ -148,4 +148,21 @@ public class OpenGroupController {
         }
     }
 
+    @RequestMapping(value="/getBsStoreImgByList",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "查询门店图片列表")
+    public ResponseData getBsStoreImgByList(@RequestBody JSONObject body) {
+        try {
+            Map<String , Object> map = new HashMap<>();
+            map.put("storeId" , body.getLong("storeId"));
+            map.put("type" , body.getLong("type"));
+
+            return ResponseMsgUtil.success(storeGroupService.getBsStoreImgByList(map));
+
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
 }