Merge branch 'mergeuat' into 'master'

Mergeuat

See merge request rays/pcloud-common-parent!15

pcloud-common-config/src/main/resources.prod/public_system.properties

@@ -83,7 +83,7 @@ liveRunEnvironment = prod_
 
 uedThirdPartyOrderUrl=https://rayscloud.chubanyun.net 
 group.qr.domain = https://weixin23.5rs.me/W23/C3/other/
-fission.use.email = 363875180@qq.com
+fission.use.email = leibin@dcrays.cn
 
 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = pro

pcloud-common-config/src/main/resources.uat/public_system.properties

@@ -85,7 +85,7 @@ liveRunEnvironment = uat_
 
 uedThirdPartyOrderUrl=http://deveapi.chubanyun.net
 group.qr.domain = https://weixin35515.raysyun.com/W35515/C35515/other/
-
+fission.use.email = lili@dcrays.cn
 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = uat