diff --git a/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java index d680bdb..d865504 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java @@ -3,7 +3,7 @@ public class ActionResultModel { private int code; - private DataModel data; + private Object data; private String message; public int getCode() { @@ -14,11 +14,11 @@ this.code = code; } - public DataModel getData() { + public Object getData() { return data; } - public void setData(DataModel data) { + public void setData(Object data) { this.data = data; } @@ -29,7 +29,4 @@ public void setMessage(String message) { this.message = message; } - - public static class DataModel { - } } diff --git a/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java b/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java index d680bdb..d865504 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/ActionResultModel.java @@ -3,7 +3,7 @@ public class ActionResultModel { private int code; - private DataModel data; + private Object data; private String message; public int getCode() { @@ -14,11 +14,11 @@ this.code = code; } - public DataModel getData() { + public Object getData() { return data; } - public void setData(DataModel data) { + public void setData(Object data) { this.data = data; } @@ -29,7 +29,4 @@ public void setMessage(String message) { this.message = message; } - - public static class DataModel { - } } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 90abe5a..9a2ba70 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -3,6 +3,7 @@ import com.alibaba.fastjson2.JSON import com.alibaba.fastjson2.JSONArray import com.alibaba.fastjson2.JSONObject +import com.casic.xz.meterage.extensions.reformat import com.casic.xz.meterage.model.SampleListModel import com.casic.xz.meterage.utils.AuthenticationHelper import com.casic.xz.meterage.utils.FileType @@ -447,12 +448,12 @@ } /** - * TODO 参数待定 * 退回委托书 */ suspend fun returnEntrust(id: String, selected: ArrayList): String { val paramObject = JSONObject() paramObject["id"] = id + paramObject["reason"] = selected.reformat() val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() )