Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

 fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java

@@ -23,6 +23,13 @@
      this.img = img;

   }



   public ClientTextStyleVO(String content, String color, String bottomColor, String img) {

      this.content = content;

      this.color = color;

      this.bottomColor = bottomColor;

      this.img = img;

   }



   public ClientTextStyleVO(String img) {

      this.img = img;

   }