Merge remote-tracking branch 'origin/master'

admin

2018-12-18 b83b2721486ec682ec6d8e3e850991b3fcd93324

 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java

@@ -264,7 +264,7 @@
      data.put("revenue", array);

      data.put("shareId", map.get("shareId"));

      data.put("shareImg", map.get("loadResult"));

      data.put("notifyDesc", configService.get("goods_share_notify"));

      data.put("notifyDesc", configService.get("goods_share_multiple_notify"));



      return data;