Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 1fd8f11537bb74c1f7e611e35a766cbbd34eff05

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

@@ -843,7 +843,7 @@
         }

         

         String rule = configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule");

         rule.replace("{链接}", configService.get("customer_service_link"));

         rule = rule.replace("{链接}", configService.get("customer_service_link"));

         

         data.put("state", state);

         data.put("balance","新人红包：" + balance.setScale(2) + "元");