Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-14 c04a59775ee986f33fe19e21ae02cff9f6b002a7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java

@@ -688,8 +688,8 @@
      

      String shareRate = "可享佣金的<label style=\"color:#E5005C;\">%s</label>";

      String fansRate = "最高佣金的<label style=\"color:#E5005C;\">%s</label>";

      String fansIndirect = "最高佣金的<label style=\"color:#E5005C;\">%s</label>";

      String teamBonus = "可享佣金的<label style=\"color:#E5005C;\">%s</label>";

      String fansIndirect = "团队分红池<label style=\"color:#E5005C;\">%s</label>";

      String teamBonus = "团队分红池<label style=\"color:#E5005C;\">%s</label>";

      // 达人版

      JSONObject jsonrRed1 = new JSONObject();

      jsonrRed1.put("shareRate", String.format(shareRate, "152%"));