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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java

@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.common.JumpDetailV2;

@@ -235,7 +236,7 @@
                  }

               }



               result.put("picture", picture);

               result.put("picture", TbImgUtil.getTBSize320Img(picture));



               String fontColor1 = "#666666";

               String fontColor2 = "#E5005C";