Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

 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;

   }