Merge branch 'master' of http://192.168.89.173/rays/pcloud-common-parent.git

b711008d · songxiang · 43968343 · 3d203828 · b711008d · b711008d
Commit b711008d authored Jan 08, 2019 by songxiang
Showing with 8 additions and 4 deletions

public_system.properties ...n-config/src/main/resources.prod/public_system.properties +4 -2

public_system.properties ...on-config/src/main/resources.uat/public_system.properties +4 -2

No files found.
--- a/pcloud-common-config/src/main/resources.prod/public_system.properties
+++ b/pcloud-common-config/src/main/resources.prod/public_system.properties
@@ -86,4 +86,6 @@ uedThirdPartyOrderUrl=https://rayscloud.chubanyun.net
 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = pro

-jsbj.agent.id = 1000009100
\ No newline at end of file
+jsbj.agent.id = 1000009100
+
+product.parentTutor.proLabelId = 7461
\ No newline at end of file
--- a/pcloud-common-config/src/main/resources.uat/public_system.properties
+++ b/pcloud-common-config/src/main/resources.uat/public_system.properties
@@ -88,4 +88,6 @@ uedThirdPartyOrderUrl=http://deveapi.chubanyun.net
 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = uat

-jsbj.agent.id = 12829
\ No newline at end of file
+jsbj.agent.id = 12829
+
+product.parentTutor.proLabelId = 812
\ No newline at end of file