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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java

@@ -145,7 +145,7 @@
         tips = tips.replace("{APP名称}", projectChineseName);

      }

      tips = tips.replace("{口令}", token).replace("{下载链接}", redPackConfigService.getValueByKey("app_down_link")).replace("{面额}",

            amount.toString());

            amount.setScale(2).toString());

      

      // 减少红包

      try {