Merge branch 'master' into div

yujian

2019-07-12 b6f6df531ab4fdaf2b800f67eb116323e07797e4

 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;

   }