Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -862,6 +862,14 @@ WHEN c.customer_source_type = 2 THEN
 	'微信公众号'
 WHEN c.customer_source_type = 3 THEN
 	'其它'
+WHEN c.customer_source_type = 4 THEN
+	'QQ群'
+WHEN c.customer_source_type = 5 THEN
+	'微信群'
+WHEN c.customer_source_type = 6 THEN
+	'个人微信'
+WHEN c.customer_source_type = 7 THEN
+	'有赞'
 ELSE
 	'未知'
 END) AS sourceType,