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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralExchange.java

@@ -92,6 +92,10 @@
   // 用户金币

   @Expose

   private String userGoldCoin;

	
   // 发布列表-需要跳转

   @Expose

   private boolean needJump;



   public Long getId() {

      return id;

@@ -220,4 +224,12 @@
   public void setUserGoldCoin(String userGoldCoin) {

      this.userGoldCoin = userGoldCoin;

   }



   public boolean isNeedJump() {

      return needJump;

   }



   public void setNeedJump(boolean needJump) {

      this.needJump = needJump;

   }

}