Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java

@@ -117,6 +117,9 @@
         if (descText.startsWith("\\r\\n"))

            descText = descText.substring(0);

         data.put("descText", descText);

         //

         data.put("notifyPicture", "");

         data.put("notifyDesc", "");



         // 添加分享记录

         BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));