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

yujian

2020-06-30 0c21d817e4ce8c287cde825ece7835596621d909

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

@@ -18,6 +18,7 @@
   public final static int TYPE_LOGIN = 1;// 登录

   public final static int TYPE_BIND = 2;// 绑定

   public final static int TYPE_EXTRACT = 3;// 提现

   public final static int TYPE_REMVOE = 4;// 绑定



   @Column(name = "sh_id")

   private Long id;