Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -15,12 +15,10 @@ import java.util.List;
  * Created by ljy on 2018/3/20.
  */
 
-@Table(name = "task")
 public class TaskEty implements Serializable{
     private String boot_address;//private String string",
     private String create_time;// 0,
     private String download_link;//private String string",
-    @Column(name = "id")
     private int id;// 0,
     private int inspect_type = 1;// 1自动审核　2手动审核
     private String package_names;//private String string",

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -242,6 +242,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void giveUpTaskSuccesView(Object o) {
         G.showToast("取消任务成功");
         CommonUtil.getInstance().setTAskEnty(null);
+        reFresh();
     }
 
     @Override
@@ -326,7 +327,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void onEventMainThread(BigEvent event){
         switch (event.getEventTypes()){
             case ONFRESH_TRYMAKEMANY_PAGE:
-                reFresh();
+//                reFresh();
                 break;
         }
     }