Merge remote-tracking branch 'origin/pre' into master_pre

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

@@ -77,7 +77,7 @@ public class TextMsgHandler implements WxMpMessageHandler {
             // 发送活动小程序卡片
             WxMpKefuMessage message1 = WxMpKefuMessage.MINIPROGRAMPAGE()
                     .appId(maConfigure.getWxMaAppid(4))
-                    .pagePath("/pages/webview?query=strawberryMusic&nickname=".concat(content))
+                    .pagePath("/pages/webview?query=strawberryMusic&voteWhere=2&nickname=".concat(content))
 //                    .thumbMediaId("ov08q51In7bXX6tXv7Few8cBjTW0osSV_t9FCLg8Q1Q") // 正在
                     .thumbMediaId("OFjnPjluDGoHH1KOAdxQ_vfMiIKRu2Eo9QFhI5TOtHE") // 摩登
                     .title("做一场白日梦，挑选你心水的草莓阵容！")