冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

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

@@ -26,6 +26,13 @@
   @Column(name = "avnh_createtime")

   private Date createTime;



   public AlipayAccountValidNormalHistory(Long id) {

      this.id = id;

   }



   public AlipayAccountValidNormalHistory() {

   }



   public Long getId() {

      return id;

   }