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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 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;