Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -145,7 +145,7 @@ public class StoreSearchUtils {
 
     private void getOnlineStoreIds(String searchJson, OnLineAuth onlineStoreAuth, List<String> list, Integer channel){
         StoreSearchQo searchQo = JSON.parseObject(searchJson).getObject(channel.toString(), StoreSearchQo.class);
-        if(searchQo.getAll() == 1){
+        if(searchQo != null && searchQo.getAll() == 1){
             onlineStoreAuth.getList().stream().filter(s -> {
                 if(s.getChannel() == channel){
                     list.addAll(s.getStoreIdList());