Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java

@@ -17,7 +17,7 @@
   /**

    * 

    */

   private static final long serialVersionUID = 1L;

   private static final Long serialVersionUID = 1L;



   @Column(name = "id")

   private Long id;

@@ -31,16 +31,16 @@
   public JumpDetail() {

   }



   public JumpDetail(long id) {

   public JumpDetail(Long id) {

      super();

      this.id = id;

   }



   public long getId() {

   public Long getId() {

      return id;

   }



   public void setId(long id) {

   public void setId(Long id) {

      this.id = id;

   }