Merge branch 'master_118' into 'developer'

朋友圈

See merge request !890

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/QwMessageController.java

@@ -130,6 +130,7 @@ public class QwMessageController extends WebBaseController {
             if(clerkType==2 && CollectionUtils.isEmpty(storeIdList)) {
                 return RestResponse.failure("-1","请选择门店");
             }
+        }else {
             storeIdList = null ;
         }
         JSONObject json = new JSONObject();