Merge branches '3.x' and 'feature/1005481' of…

Merge branches '3.x' and 'feature/1005481' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-common-parent into 3.x

 Conflicts:
	pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQTopicProducer.java
	pcloud-common-core/src/main/java/com/pcloud/common/core/dto/SendMessageDto.java

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQTopicProducer.java

@@ -479,4 +479,9 @@ public class MQTopicProducer {
 	 * 会员活动书刊配置
 	 */
 	public static final String MEMBER_ACTIVITY_BOOK_SET = "topic.memberActivityBookSet";
+
+	/**
+	 *  服务消息预警
+	 */
+	public static final String ALERT_MESSAGE_COUNT = "topic.alertMessageCount";
 }