Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

liu

2 天以前 950e1332f89e3d18a8f4b415bd4fe274dce1e954

1
2
3
4
{
  "updatePassword": "Update Password",
  "updateBasicProfile": "Update Basic Profile"
}