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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java

@@ -188,6 +188,7 @@
      this.rankIcon = rankIcon;

   }



   // TODO

   public UserInfo() {

      openid = "";

      wxOpenId = "";