风险管理7月17日提交代码-liu.bolan-千海金

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ContractFinancingData.kt

@@ -2,27 +2,47 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //融资明细(合同)
 data class ContractFinancingData(
+    @SerializedName("contractconfirmtime")
     val contractconfirmtime : String? = "",//合同确认时间(时间)
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("goodscode")
     val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品ID [5:融资单]
+    @SerializedName("goodsname")
     val goodsname : String? = "",//商品名称
+    @SerializedName("goodunitid")
     val goodunitid : String? = "",//商品单位id
+    @SerializedName("initmargin")
     val initmargin : String? = "",//初始保证金(首付款)
+    @SerializedName("lenderamount")
     val lenderamount : String? = "",//贷款金额(总额|订单总额)
+    @SerializedName("marginratio")
     val marginratio : String? = "",//保证金比率(首付比例)
+    @SerializedName("payamount")
     val payamount : String? = "",//已付(已付货款)
+    @SerializedName("recoveredmargin")
     val recoveredmargin : String? = "",//已追缴保证金
+    @SerializedName("remainamount")
     val remainamount : String? = "",//合同剩余金额(融资额)
+    @SerializedName("scfcontractid")
     val scfcontractid : String? = "",//SCF合同ID(310+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("scfcontracttype")
     val scfcontracttype : String? = "",//合同类型 - 1:仓单回购 2:仓单质押 3:合作套保 4:资金贷款 5:融资单
+    @SerializedName("totalinterest")
     val totalinterest : String? = "",//已计总利息(利息)
+    @SerializedName("tradeprice")
     val tradeprice : String? = "",//成交价格(成本价格)
+    @SerializedName("userid")
     val userid : String? = "",//用户ID
+    @SerializedName("username")
     val username : String? = "",//用户名称
+    @SerializedName("wrqty")
     val wrqty : String? = ""//仓单数量(数量)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ContractLogData.kt

@@ -2,14 +2,21 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //融资明细流水
 data class ContractLogData(
+    @SerializedName("amount")
     val amount : String? = "",
+    @SerializedName("amounttype")
     val amounttype : String? = "",
+    @SerializedName("logid")
     val logid : String? = "",
+    @SerializedName("remainamount")
     val remainamount : String? = "",
+    @SerializedName("scfcontractid")
     val scfcontractid : String? = "",
+    @SerializedName("updatetime")
     val updatetime : String? = ""
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ContractTradeOrderDetailData.kt

@@ -2,81 +2,153 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 委托单查询请求（合约市场）
  */
 data class ContractTradeOrderDetailData(
+    @SerializedName("accountid")
     val accountid : String? = "",//账户ID[报价币种]
+    @SerializedName("buildtype")
     val buildtype : String? = "",//委托单据类型 1:建仓 2:平仓 3:先平后建
+    @SerializedName("buyorsell")
     val buyorsell : String? = "",//方向 - 0:买 1:卖
+    @SerializedName("cancelorderid")
     val cancelorderid : String? = "",//撤单单号(撤单时填写)
+    @SerializedName("cancelqty")
     val cancelqty : String? = "",//撤单数量
+    @SerializedName("clientordertime")
     val clientordertime : String? = "",//客户端委托时间
+    @SerializedName("clientticket")
     val clientticket : String? = "",//客户端流水号
+    @SerializedName("clienttype")
     val clienttype : String? = "",//客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端安卓 4:网页客户端 5:微信客户端 6:手机客户端苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
+    @SerializedName("closeexchagechargevalue")
     val closeexchagechargevalue : String? = "",//平仓交易所手续费设置值
+    @SerializedName("closefeealgorithm")
     val closefeealgorithm : String? = "",//平仓手续费收取方式 1：比率 2：固定
+    @SerializedName("closefreezecharge")
     val closefreezecharge : String? = "",//平仓冻结手续费(先建后平操作,需要记录)
+    @SerializedName("closememberchargevalue")
     val closememberchargevalue : String? = "",//平仓会员手续费设置值
+    @SerializedName("enableqty")
     val enableqty : String? = "",//可用数量 = 委托数量 - 成交数量 - 撤单数量
+    @SerializedName("closeqty")
     val closeqty : String? = "",//平仓数量(先建后平操作 需要记录)
+    @SerializedName("closetradeqty")
     val closetradeqty : String? = "",//平仓成交数量(先建后平操作,需要记录)
+    @SerializedName("closeunfreezecharge")
     val closeunfreezecharge : String? = "",//平仓解冻手续费(先建后平操作,需要记录)
+    @SerializedName("delistingtype")
     val delistingtype : String? = "",//摘牌类型 - 1:价格最优 2:点选成交
+    @SerializedName("freezecharge")
     val freezecharge : String? = "",//冻结手续费
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位
+    @SerializedName("freezemargin")
     val freezemargin : String? = "",//冻结保证金(冻结交易金额)
+    @SerializedName("gcaccountid")
     val gcaccountid : String? = "",//账户ID[合约币种]
+    @SerializedName("goodscode")
     val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品ID
+    @SerializedName("goodsname")
     val goodsname : String? = "",//商品名称
+    @SerializedName("histradedate")
     val histradedate : String? = "",//历史交易日
+    @SerializedName("isconfirmexercise")
     val isconfirmexercise : String? = "",//是否确认行权- 0:否 1:是
+    @SerializedName("ispreexercise")
     val ispreexercise : String? = "",//是否预申报- 0:否 1:是
+    @SerializedName("isvaliddata")
     val isvaliddata : String? = "",//是否有效 - 0:无效 1:有效
+    @SerializedName("listingselecttype")
     val listingselecttype : String? = "",//挂牌点选类型 - 1:挂牌 2:摘牌 3:先摘后挂
+    @SerializedName("marginalgorithm")
     val marginalgorithm : String? = "",//保证金收取方式 1：比率 2：固定
+    @SerializedName("marginvalue")
     val marginvalue : String? = "",//即市保证金设置值
+    @SerializedName("marketid")
     val marketid : String? = "",//市场ID
+    @SerializedName("marketmaxsub")
     val marketmaxsub : String? = "",//市价最大偏移范围
+    @SerializedName("marketname")
     val marketname : String? = "",//市场名称
+    @SerializedName("memberuserid")
     val memberuserid : String? = "",//所属会员UserID
+    @SerializedName("openexchagechargevalue")
     val openexchagechargevalue : String? = "",//建仓交易所手续费设置值
+    @SerializedName("openfeealgorithm")
     val openfeealgorithm : String? = "",//建仓手续费收取方式 1：比率 2：固定
+    @SerializedName("openfreezecharge")
     val openfreezecharge : String? = "",//开仓冻结手续费(先建后平操作,需要记录)
+    @SerializedName("openmemberchargevalue")
     val openmemberchargevalue : String?  ="",//建仓会员手续费设置值
+    @SerializedName("openqty")
     val openqty : String?  ="",//开仓数量(先建后平操作,需要记录)
+    @SerializedName("opentradeqty")
     val opentradeqty : String? = "",//开仓成交数量(先建后平操作,需要记录)
+    @SerializedName("openunfreezecharge")
     val openunfreezecharge : String? = "",//开仓解冻手续费(先建后平操作,需要记录)
+    @SerializedName("operatetype")
     val operatetype : String? = "",//操作类型 - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让
+    @SerializedName("operatorid")
     val operatorid : String? = "",//登录账号(LoginID)
+    @SerializedName("optiontype")
     val optiontype : String? = "",//期权类型 - 1:认购(看涨) 2:认沽(看跌)
+    @SerializedName("orderid")
     val orderid : String? = "",//委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxx
+    @SerializedName("orderprice")
     val orderprice : String? = "",//委托价格
+    @SerializedName("orderqty")
     val orderqty : String? = "",//委托数量
+    @SerializedName("ordersrc")
     val ordersrc : String? = "",//委托来源 - 1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发
+    @SerializedName("orderstatus")
     val orderstatus : String? = "",//委托状态 - 1： 委托请求 2：待冻结 3：委托成功 4： 委托失败 5：配对成功 6： 已撤销 7：部分成交 8：已成交 9：部成部撤 10：成交失败 11：已拒绝 12:经过摘牌(先摘后挂专用-先摘后挂已摘过) 13:冻结成功(通道交易专用) 14:通道已撤 15:通道部成部撤 16:成交失败违约(荷兰式竞拍专用)
+    @SerializedName("ordertime")
     val ordertime : String? = "",//委托时间
+    @SerializedName("preexerciseprice")
     val preexerciseprice : String? = "",//预申报价格
+    @SerializedName("premium")
     val premium : String?  ="",//权利金
+    @SerializedName("preorderid")
     val preorderid : String? = "",//关联预埋单号(止盈止损单时填写)
+    @SerializedName("pricemode")
     val pricemode : String? = "",//取价方式 - 1:市价 2: 限价
+    @SerializedName("quoteid")
     val quoteid : String?  ="",//报价单ID
+    @SerializedName("relatedid")
     val relatedid : String?  ="",//关联单号(交割单)
+    @SerializedName("retcode")
     val retcode : String?  ="",//错误代码
+    @SerializedName("sessionid")
     val sessionid : String? = "",//会话ID
+    @SerializedName("tradedate")
     val tradedate : String? = "",//交易日(yyyyMMdd)
+    @SerializedName("trademode")
     val trademode : String?  ="",//交易模式
+    @SerializedName("tradeproperty")
     val tradeproperty : String?  ="",//交易属性
+    @SerializedName("tradeqty")
     val tradeqty : String? = "",//成交数量
+    @SerializedName("unfreezecharge")
     val unfreezecharge : String? = "",//解冻手续费
+    @SerializedName("unfreezemargin")
     val unfreezemargin : String? = "",//解冻保证金
+    @SerializedName("updatetime")
     val updatetime: String?  ="",//更新时间
+    @SerializedName("uuid")
     val uuid : String? = "",//发起端唯一id
+    @SerializedName("validtime")
     val validtime : String? = "",//有效期限
+    @SerializedName("isClick")
     var isClick : Int = 0,//是否点击展开
+    @SerializedName("validtype")
     val validtype : String? = "",//有效类型 - 1当日有效 2本周有效 3指定日期有效 4一直有效 5指定时间有效
+    @SerializedName("volumetype")
     val volumetype : String? =""//当时间有效类型为 “立即执行否则取消 IOC” 时，需要此项 - 0:任意量 1:最小量（暂时不支持） 2:全部量
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ContractTradePositionData.kt

@@ -2,39 +2,69 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  *
  */
 data class ContractTradePositionData(
+    @SerializedName("accountid")
     val accountid : String? = "",//资金账户
+    @SerializedName("agreeunit")
     val agreeunit : String? = "",//合约单位
+    @SerializedName("averageprice")
     val averageprice : String? = "",//持仓均价
+    @SerializedName("buyorsell")
     val buyorsell : String? = "",//方向 - 0:买 1:卖
+    @SerializedName("closetotalqty")
     val closetotalqty : String? = "",//平仓总数量
+    @SerializedName("curholderamount")
     val curholderamount : String? = "",//当前持仓总金额[商品币种]
+    @SerializedName("curpositionqty")
     val curpositionqty : String? = "",//当前持仓总数量
+    @SerializedName("currencyid")
     val currencyid : String? = "",//报价货币ID
+    @SerializedName("curtdposition")
     val curtdposition : String? = "",//期末今日头寸
+    @SerializedName("decimalplace")
     val decimalplace : String? = "",//报价小数位
+    @SerializedName("enableqty")
     val enableqty : String? = "",//可用量
+    @SerializedName("fretdposition")
     val fretdposition : String? = "",//冻结今日头寸
+    @SerializedName("frozenqty")
     val frozenqty : String? = "",//持仓冻结数量
+    @SerializedName("goodscode")
     val goodscode : String?  ="",//商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品Id
+    @SerializedName("goodsname")
     val goodsname : String? = "",//商品名称
+    @SerializedName("goodunit")
     val goodunit : String? = "",//报价单位
+    @SerializedName("goodunitid")
     val goodunitid : String? = "",//报价单位ID
+    @SerializedName("holderamount")
     val holderamount : String? = "",//期初持仓总金额[商品币种]
+    @SerializedName("marketid")
     val marketid : String? = "",//所属市场ID
+    @SerializedName("openreqqty")
     val openreqqty : String? = "",//开仓申请数量(用于比较最大持仓数量)
+    @SerializedName("opentotalqty")
     val opentotalqty : String? = "",//开仓总数量
+    @SerializedName("otherfrozenqty")
     val otherfrozenqty : String?  ="",//持仓其他冻结数量(交割冻结)
+    @SerializedName("positionqty")
     val positionqty : String? = "",//期初持仓数量
+    @SerializedName("tnqty")
     val tnqty : String? = "",//T+N冻结总量
+    @SerializedName("tnusedqty")
     val tnusedqty : String? = "",//T+N使用量(可以使用T+N的冻结数量)
+    @SerializedName("trademode")
     val trademode : String? ="",//交易模式
+    @SerializedName("isClick")
     var isClick : Int = 0,//是否点击展开
+    @SerializedName("usedmargin")
     val usedmargin :String? = ""//占用保证金[商品币种]
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/CusBankSignBankData.kt

@@ -2,34 +2,62 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 data class CusBankSignBankData(
+    @SerializedName("banklst")
     val banklst : List<QhjBankInfo>? = arrayListOf(),//银行列表
+    @SerializedName("canallot")
     val canallot : String? = "",//是否支持跨行调拨 - 0:不支持 1:支持
+    @SerializedName("canallotquery")
     val canallotquery : String? = "",//是否支持跨行调拨查询 - 0:不支持 1:支持
+    @SerializedName("canbindcard")
     val canbindcard : String? = "",//是否可绑卡与解卡 - 0:不可 1:可以
+    @SerializedName("caninamount")
     val caninamount : String? = "",//是否可入金 - 0:不可 1:可以
+    @SerializedName("caninamount2")
     val caninamount2 : String? = "",//是否可入金(网银端) - 0:不可 1:可以
+    @SerializedName("canmodifybankcard")
     val canmodifybankcard : String? = "",//是否可修改银行卡号 - 0:不可 1:可以
+    @SerializedName("canmodifyphone")
     val canmodifyphone : String? = "",//是否可修改手机号 - 0:不可 1:可以
+    @SerializedName("canmodifysigninfo")
     val canmodifysigninfo  : String? = "",//是否可修改签约信息 - 0:不可 1:可以
+    @SerializedName("canoutamount")
     val canoutamount : String? = "",//是否可出金 - 0:不可 1:可以
+    @SerializedName("canoutamount2")
     val canoutamount2 : String? = "",//是否可出金(网银端) - 0:不可 1:可以
+    @SerializedName("canrelease")
     val canrelease : String? = "",//是否可解约 - 0:不可 1:可以
+    @SerializedName("canrelease2")
     val canrelease2 : String? = "",//是否可解约(网银端) - 0:不可 1:可以
+    @SerializedName("cansign")
     val cansign : String? = "",//是否可签约 - 0:不可 1:可以
+    @SerializedName("cansign2")
     val cansign2 : String? = "",//是否可签约(网银端) - 0:不可 1:可以
+    @SerializedName("currency")
     val currency : String? = "",//币种
+    @SerializedName("cusbankid")
     val cusbankid : String? = "",//托管银行编号(对应清算中心TRAN_NO)
+    @SerializedName("cusbankname")
     val cusbankname : String? = "",//银行业务名称
+    @SerializedName("cusbankshortname")
     val cusbankshortname : String? = "",//银行业务简称
+    @SerializedName("exchbankid")
     val exchbankid : String? = "",//交易所开户银行ID
+    @SerializedName("exchpaybankaccname")
     val exchpaybankaccname : String? = "",//交易所支出结算账户户名
+    @SerializedName("exchpaybankaccno")
     val exchpaybankaccno : String? = "",//交易所支出结算账户
+    @SerializedName("isneedcheck")
     val isneedcheck : String? = "",//是否需要对账 - 0:需要 1:不需要 [不需要界面配置]
+    @SerializedName("isneedclear")
     val isneedclear : String? = "",//是否需要清算 - 0:不需要 1:需要
+    @SerializedName("tradedate")
     val tradedate : String? = "",//交易日
+    @SerializedName("updatetime")
     val updatetime : String? = "",//当前签到/签退更新时间
+    @SerializedName("riskinfo")
     val riskinfo : String? = ""//签约风险提示书
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -109,10 +137,15 @@ data class CusBankSignBankData(
 }
 
 data class QhjBankInfo(
+    @SerializedName("bankid")
     val bankid : String? = "",//银行ID
+    @SerializedName("bankname")
     val bankname : String? = "",//银行名称
+    @SerializedName("clearbankno")
     val clearbankno : String? = "",//清算系统银行编号
+    @SerializedName("orderindex")
     val orderindex : String? = "",//排序顺序
+    @SerializedName("status")
     val status : String? = ""//状态 - 0:正常 1:注销
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/DeliveryGoodsData.kt

@@ -2,26 +2,43 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * /Ermcp3/QueryDeliveryGoods查询现货商品
  */
 data class DeliveryGoodsData(
+    @SerializedName("agreeunit")
     val agreeunit : String? = "",//合约单位[散货时默认为1， 整装时默认为标准数量]
+    @SerializedName("areauserid")
     val areauserid :String? = "",//所属机构
+    @SerializedName("auditflag")
     val auditflag : String? = "",//交割是否需要审核 - 0:不需要 1:需要审核 默认为0
+    @SerializedName("categoryid")
     val categoryid : String? = "",//类别ID(SEQ_WRCATEGORY)
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种ID(SEQ_DELIVERYGOODS)
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("deliverygoodstype")
     val deliverygoodstype : String? = "",//现货品种类型: 1-整装不拆分 2-散装记录明细 3:整装拆分 4:散装不记录明细
+    @SerializedName("dgstatus")
     val dgstatus : String? = "",//品种状态 - 作废 - 0:未激活 1:正常
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//现货品种单位名称
+    @SerializedName("goodsunitid")
     val goodsunitid : String? = "",//现货品种单位ID
+    @SerializedName("isvalid")
     val isvalid : String? = "",//是否有效 - 0:无效 1:有效
+    @SerializedName("qtydecimalplace")
     val qtydecimalplace : String? = "",//成交量小数位
+    @SerializedName("standardqty")
     val standardqty : String? = "",//标准数量(库位数量) [标准品特有]
+    @SerializedName("standardqtyrange")
     val standardqtyrange : String? = "",//标准数量偏差范围 [标准品特有]
+    @SerializedName("indexSelect")
     var indexSelect : Int = 0
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/DeliveryGoodsDetailData.kt

@@ -2,18 +2,27 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 现货商品详情实体
  */
 data class DeliveryGoodsDetailData(
+    @SerializedName("isSelectAll")
     var isSelectAll : Int = 0,//是否全部展开
+    @SerializedName("categoryIsSelect")
     var categoryIsSelect : Int = 1,//品类是否展开
+    @SerializedName("brandIsSelect")
     var brandIsSelect : Int = 1,//品牌是否展开
+    @SerializedName("data")
     val data : ErmcpDeliveryGoods? = ErmcpDeliveryGoods(),
+    @SerializedName("gblist")
     val gblist : List<Ermcp3Brand>? = arrayListOf(),//品牌列表
+    @SerializedName("gmlist")
     val gmlist : List<Ermcp3Wrstandard>? = arrayListOf(),//品类列表(仓单标准)
+    @SerializedName("mgList")
     val mgList : List<Ermcp3MiddleGoodsDetail>? = arrayListOf(),
+    @SerializedName("hedgeIsSelect")
     var hedgeIsSelect : Int = 1//套保是否展开
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -56,21 +65,37 @@ data class DeliveryGoodsDetailData(
 }
 
 data class ErmcpDeliveryGoods(
+    @SerializedName("agreeunit")
     val agreeunit : String? = "",//合约单位[散货时默认为1， 整装时默认为标准数量]
+    @SerializedName("areauserid")
     val areauserid: String? = "",//所属机构
+    @SerializedName("auditflag")
     val auditflag : String? = "",//交割是否需要审核 - 0:不需要 1:需要审核 默认为0
+    @SerializedName("categoryid")
     val categoryid : String? = "",//类别ID(SEQ_WRCATEGORY)
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String?  ="",//现货品种ID(SEQ_DELIVERYGOODS)
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("deliverygoodstype")
     val deliverygoodstype : String? = "",//现货品种类型: 1-整装不拆分 2-散装记录明细 3:整装拆分 4:散装不记录明细
+    @SerializedName("dgstatus")
     val dgstatus : String? = "",//品种状态 - 作废 - 0:未激活 1:正常
+    @SerializedName("enumdicname")
     val enumdicname : String?  ="",//现货品种单位名称
+    @SerializedName("goodsunitid")
     val goodsunitid : String? ="",//现货品种单位ID
+    @SerializedName("isvalid")
     val isvalid : String? ="",//是否有效 - 0:无效 1:有效
+    @SerializedName("qtydecimalplace")
     val qtydecimalplace : String? = "",//成交量小数位
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("standardqty")
     val standardqty : String?  = "",//标准数量(库位数量) [标准品特有]
+    @SerializedName("standardqtyrange")
     val standardqtyrange : String? = ""//标准数量偏差范围 [标准品特有]
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -129,9 +154,13 @@ data class ErmcpDeliveryGoods(
 }
 //品牌列表
 data class Ermcp3Brand(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//用户id
+    @SerializedName("brandid")
     val brandid : String? = "",//品牌id
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = ""//品种ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -166,22 +195,39 @@ data class Ermcp3Brand(
 }
 //品类列表(仓单标准)
 data class Ermcp3Wrstandard(
+     @SerializedName("areauserid")
      val areauserid : String? = "",//所属机构
+     @SerializedName("convertfactor")
      val convertfactor : String? = "",//标仓系数
+     @SerializedName("createtime")
      val createtime : String? = "",//创建时间
+     @SerializedName("creatorid")
      val creatorid : String? = "",//创建人
+     @SerializedName("deliverygoodsid")
      val deliverygoodsid : String? = "",//现货品种ID
+     @SerializedName("enumdicname")
      val enumdicname : String? = "",//品类单位名称
+     @SerializedName("isvalid")
      val isvalid : String? = "",//是否有效 0-无效(停用) 1-有效(正常)
+     @SerializedName("minivalue")
      val minivalue : String? = "",//最小变动值
+     @SerializedName("minivaluedp")
      val minivaluedp : String? = "",//最小变动值小数位
+     @SerializedName("realminivalue")
      val realminivalue : String? = "",//实际最小变动值
+     @SerializedName("realminivaluedp")
      val realminivaluedp : String? = "",//实际最小变动值小数位
+     @SerializedName("remark")
      val remark : String? = "",//备注
+     @SerializedName("unitid")
      val unitid : String? = "",//品类单位ID
+     @SerializedName("updatetime")
      val updatetime : String? = "",//更新时间
+     @SerializedName("wrstandardcode")
      val wrstandardcode : String? = "",//品类代码
+     @SerializedName("wrstandardid")
      val wrstandardid : String? = "",//品类ID(SEQ_WRSTANDARD)
+     @SerializedName("wrstandardname")
      val wrstandardname : String? = ""//品类名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -242,9 +288,13 @@ data class Ermcp3Wrstandard(
 }
 //套保列表
 data class Ermcp3MiddleGoodsDetail(
+    @SerializedName("isSelect")
     var isSelect : Int = 0,//套保内的期货品种是否展开
+    @SerializedName("mg")
     val mg : ErmcpMiddleGoodsModel? = ErmcpMiddleGoodsModel(), //
+    @SerializedName("gplist")
     val gplist : List<Ermcp3GoodsGroupEx>? = arrayListOf(),
+    @SerializedName("convertratio")
     val convertratio : String? = ""//套保系数(折算系数)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -281,13 +331,21 @@ data class Ermcp3MiddleGoodsDetail(
 
 //关联商品组列表
 data class Ermcp3GoodsGroupEx(
+    @SerializedName("isFutureSelect")
     var isFutureSelect : Int = 0,//期货合约是否展开
+    @SerializedName("convertratio")
     val convertratio : String? = "",//折算系数(品种系数)
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("exexchangecode")
     val exexchangecode : String? = "",//交易所代码
+    @SerializedName("goodsgroupid")
     val goodsgroupid : String? = "",//商品组id
+    @SerializedName("goodsgroupname")
     val goodsgroupname : String? = "",//商品组名称
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保商品id
+    @SerializedName("glist")
     val glist : List<Ermcp3Goods>? = arrayListOf()//合约列表
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -332,11 +390,17 @@ data class Ermcp3GoodsGroupEx(
 
 //合约列表
 data class Ermcp3Goods(
+    @SerializedName("agreeunit")
     val agreeunit : String? = "",//合约单位(合约乘数)
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("exexchangecode")
     val exexchangecode : String? = "",//交易所代码
+    @SerializedName("goodscode")
     val goodscode : String? = "",//期货商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//期货商品id
+    @SerializedName("goodsname")
     val goodsname : String? = ""//期货商品名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -375,21 +439,37 @@ data class Ermcp3Goods(
 }
 
 data class ErmcpMiddleGoodsModel(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//机构用户ID
+    @SerializedName("createtime")
     val createtime : String? = "",//修改时间
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("evaluateratio")
     val evaluateratio : String? = "",//估价系数
+    @SerializedName("goodsgroupid")
     val goodsgroupid : String? = "",//关联期货品种ID
+    @SerializedName("isvalid")
     val isvalid : String? = "",//状态 0-无效(停用) 1-有效(正常)
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保品种代码
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String? = "",//套保品种名称
+    @SerializedName("modifytime")
     val modifytime : String? = "",//修改时间
+    @SerializedName("needhedgeratio")
     val needhedgeratio : String? = "",//套保比率
+    @SerializedName("qtydecimalplace")
     val qtydecimalplace : String? = "",//数量小数位
+    @SerializedName("relatedgoodsid")
     val relatedgoodsid : String? = "",//关联交易商品ID
+    @SerializedName("relatedgoodstype")
     val relatedgoodstype : String? = "",//关联商品类型 - 1:期货合约 2:现货品种
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("goodsunitid")
     val goodsunitid : String? = ""
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/Ermcp3GoodsbrandData.kt

@@ -2,14 +2,19 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * Ermcp3/QueryGoodsbrand查询商品品牌
  */
 data class Ermcp3GoodsbrandData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//用户id
+    @SerializedName("brandid")
     val brandid : String? = "",//品牌id
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = ""//品种ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ErmcpRoleFuncMenuData.kt

@@ -1,16 +1,27 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 企业风管终端权限
  */
 data class ErmcpRoleFuncMenuData(
+    @SerializedName("iconame")
     val iconame : String = "",//菜单图标
+    @SerializedName("menutype")
     val menutype : String = "",//菜单类型 1-管理端 2-交易端 3-终端权限
+    @SerializedName("parentcode")
     val parentcode : String = "",//上级资源代码
+    @SerializedName("remark")
     val remark : String = "",//备注
+    @SerializedName("resourcecode")
     val resourcecode : String = "",//资源代码
+    @SerializedName("resourcelevel")
     val resourcelevel : String = "",//级别 1-一级 2-二级 3-三级 4-四级
+    @SerializedName("resourcename")
     val resourcename : String = "",//资源名
+    @SerializedName("sort")
     val sort : String = "",//排序 - 一级时，是所有一级菜单的排序顺序；二级时是所属同一个一级菜单下的排序、三级时是同一个二级菜单下的排序
+    @SerializedName("url")
     val url : String = ""//URL
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ExposureDetailData.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 敞口现货明细/敞口现货头寸(
@@ -24,26 +25,47 @@ import android.os.Parcelable
  * @constructor
  */
 data class ExposureDetailData(
+    @SerializedName("areauserid")
     val areauserid : String?,
+    @SerializedName("changeQty")
     val changeQty : String?,
+    @SerializedName("contracttype")
     val contracttype : String?,
+    @SerializedName("convertfactor")
     val convertfactor : String?,
+    @SerializedName("convertratio")
     val convertratio : String?,
+    @SerializedName("createtime")
     val createtime  : String?,
+    @SerializedName("enumdicname")
     val enumdicname : String?,
+    @SerializedName("logtype")
     val logtype : String?,
+    @SerializedName("middlegoodsId")
     val middlegoodsId : String?,
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String?,
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String?,
+    @SerializedName("qty")
     val qty : String?,
+    @SerializedName("relateNo")
     val relateNo : String?,
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String?,
+    @SerializedName("wrstandardid")
     val wrstandardid : String?,
+    @SerializedName("wrstandardname")
     val wrstandardname : String?,
+    @SerializedName("decreaseqty")
     val decreaseqty : String?,//减少数量=-(销售已定价数量+采购计划数量)
+    @SerializedName("increaseqty")
     val increaseqty : String?,//增加数量=销售计划数量+采购已定价数量
+    @SerializedName("oritoalspotqty")
     val oritoalspotqty : String?,//昨日数量
+    @SerializedName("totalspotqty")
     val totalspotqty : String?,//当前数量(现货头寸总量) = (销售计划数量 - 销售已定价数量) - (采购计划数量 - 采购已定价数量)
+    @SerializedName("updatetime")
     val updatetime : String?//更新时间
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ExposureHistoryData.kt

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 历史敞口
  * @property middlegoodsid String
@@ -10,15 +12,23 @@ package cn.muchinfo.rma.global.data
  * @constructor
  */
 data class ExposureHistoryData(
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String = "",//套保品种ID
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String = "",//套保品种名称
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String = "",//套保品种代码
+    @SerializedName("enumdicname")
     val enumdicname : String = "",//单位名称
+    @SerializedName("data")
     val data : List<ExposureHistoryChartData> = arrayListOf()
 )
 
 data class ExposureHistoryChartData(
+    @SerializedName("needhedgeexposoure")
     val needhedgeexposoure : Double = 0.0,//应套保敞口
+    @SerializedName("reckondate")
     val reckondate : String = "",//日照时期(yyyyMMdd)
+    @SerializedName("totalexposure")
     val totalexposure : Double = 0.0//总敞口
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ExposureRealTimeDetailsData.kt

@@ -1,38 +1,69 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 用于实时敞口的现货明细与期货明细的实体
  */
 data class ExposureRealTimeDetailsData(
     //现货明细
+    @SerializedName("areauserid")
     val areauserid : String? = "",// 现货 ： 机构ID /  期货：所属机构id
+    @SerializedName("changeQty")
     val changeQty : String? = "",//套保变动量
+    @SerializedName("contracttype")
     val contracttype : String? = "",//现货合同类型 - 1:采购 -1:销售
+    @SerializedName("convertfactor")
     val convertfactor : String? = "",//标仓系数
+    @SerializedName("convertratio")
     val convertratio : String? = "",// 现货 ： 套保系数  期货 ： 期货品种系数(折算系数)
+    @SerializedName("createtime")
     val createtime : String? = "",//时间
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//现货商品单位名称
+    @SerializedName("logtype")
     val logtype : String? = "",//类型 - 1:套保计划 2:现货合同
+    @SerializedName("middlegoodsId")
     val middlegoodsId : String? = "",//套保商品id
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保商品代码
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String? = "",//套保商品名称
+    @SerializedName("qty")
     val qty : String? = "",//数量
+    @SerializedName("relateNo")
     val relateNo : String? = "",//现货合同/套保计划编号
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货商品代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode :String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种id
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货商品名称
     //期货明细
+    @SerializedName("agreeunit")
     val agreeunit : String? = "",//合约单位
+    @SerializedName("curqty")
     val curqty : String? = "",//当前持仓
+    @SerializedName("diffhedgeqty")
     val diffhedgeqty : String? = "",//套保品种变动量=持仓变动量期货合约单位期货品种系数
+    @SerializedName("diffqty")
     val diffqty : String? = "",//持仓变动量=当前持仓-昨日持仓
+    @SerializedName("goodscode")
     val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品id
+    @SerializedName("goodsname")
     val goodsname : String? = "",//商品名称
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保商品id
+    @SerializedName("ydqty")
     val ydqty : String? = "",//昨日持仓
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf()//组装的右侧数据
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ExposureReportData.kt

@@ -2,69 +2,129 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 敞口报表数据
  */
 data class ExposureReportData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构
+    @SerializedName("buyfutureqty")
     val buyfutureqty : String? = "",//买入期货数量
+    @SerializedName("buyplanqty")
     val buyplanqty : String? = "",//采购计划数量
+    @SerializedName("buypricedqty")
     val buypricedqty : String? = "",//采购合同已定价数量
+    @SerializedName("difffutuqty")
     val difffutuqty : String? = "0",//变动量(期货)
+    @SerializedName("diffspotqty")
     val diffspotqty : String? = "0",//变动量(现货)
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保品种代码
+    @SerializedName("middlegoodshedgeratio")
     val middlegoodshedgeratio : String? = "",//应套保比例
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保品种ID
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String? = "",//套保品种名称
+    @SerializedName("needhedgeexposoure")
     val needhedgeexposoure : String? = "",//应套保敞口
+    @SerializedName("needhedgeratio")
     val needhedgeratio : String? = "",//应套保敞口比例
+    @SerializedName("oriTotalFutuQty")
     val oriTotalFutuQty : String? = "",//期初期货数量=期初买入期货数量-期初卖出期货数量
+    @SerializedName("oritotalspotqty")
     val oritotalspotqty : String? = "",//期初现货头寸总量
+    @SerializedName("oribuyfutureqty")
     val oribuyfutureqty : String? = "",//期初买入期货数量
+    @SerializedName("oribuyplanqty")
     val oribuyplanqty : String? = "",//期初采购计划数量
+    @SerializedName("oribuypricedqty")
     val oribuypricedqty : String? = "",//期初采购合同已定价数量
+    @SerializedName("orisellfutureqty")
     val orisellfutureqty : String? = "",//期初卖出期货数量
+    @SerializedName("orisellplanqty")
     val orisellplanqty : String? = "",//期初销售计划数量
+    @SerializedName("orisellpricedqty")
     val orisellpricedqty : String? = "",//期初销售合同已定价数量
+    @SerializedName("reckondate")
     val reckondate : String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("sellfutureqty")
     val sellfutureqty : String? = "",//卖出期货数量
+    @SerializedName("sellplanqty")
     val sellplanqty : String? = "",//销售计划数量
+    @SerializedName("sellpricedqty")
     val sellpricedqty : String? = "",//销售合同已定价数量
+    @SerializedName("totalexposure")
     val totalexposure : String? = "",//实时总敞口(总敞口)
+    @SerializedName("totalfutureqty")
     val totalfutureqty : String? = "",//期货数量
+    @SerializedName("totalhedgeratio")
     val totalhedgeratio : String? = "",//敞口比例
+    @SerializedName("totalneedhedgeqty")
     val totalneedhedgeqty : String? = "",//期货应套保量
+    @SerializedName("totalspotqty")
     val totalspotqty : String? = "",//现货数量
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf(),//组装的右侧数据
+    @SerializedName("accountid")
     val accountid : String? = "",//期货账户ID (作废, 默认为0)
+    @SerializedName("accountname")
     val accountname : String? = "",//机构名称
+    @SerializedName("arbitrageqty")
     val arbitrageqty : String? = "",//套利量
+    @SerializedName("cycletime")
     val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
     val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @SerializedName("diffexposure")
     val diffexposure : String? = "",//变动量(套保敞口)
+    @SerializedName("diffhedgeqty")
     val diffhedgeqty : String? = "0",//变动量(现货应套保总量)
+    @SerializedName("diffmgqtya")
     val diffmgqtya : String? = "",//套保变动量
+    @SerializedName("diffmgqtyb")
     val diffmgqtyb : String? = "",//套利变动量
+    @SerializedName("diffqty")
     val diffqty : String? = "",//变动量(总敞口)
+    @SerializedName("hedgeqty")
     val hedgeqty : String? = "",//套保量
+    @SerializedName("mgneedhedgeratio")
     val mgneedhedgeratio : String? = "",//套保比例(套保品的)
+    @SerializedName("middlgoodscode")
     val middlgoodscode : String? = "",//套保商品代码
+    @SerializedName("needarbitrageqty")
     val needarbitrageqty : String? = "",//应套利量
+    @SerializedName("needarbitrageratio")
     val needarbitrageratio : String? = "",//套利比例(套保品的)
+    @SerializedName("needhedgeqty")
     val needhedgeqty : String? = "",//应套保量
+    @SerializedName("oriarbitrageqty")
     val oriarbitrageqty : String? = "",//期初套利量
+    @SerializedName("orihedgeqty")
     val orihedgeqty : String? = "",//期初套保量
+    @SerializedName("orineedarbitrageqty")
     val orineedarbitrageqty : String? = "",//期初应套利量
+    @SerializedName("orineedhedgeexposoure")
     val orineedhedgeexposoure : String? = "",//期初应套保敞口
+    @SerializedName("orineedhedgeqty")
     val orineedhedgeqty : String? = "",//期初应套保量
+    @SerializedName("oritotalexposure")
     val oritotalexposure : String? = "",//期初实时总敞口
+    @SerializedName("oritotalfutureqty")
     val oritotalfutureqty : String? = "",//期初期货头寸总量
+    @SerializedName("oritotalneedhedgeqty")
     val oritotalneedhedgeqty : String? = "",//期初应套保总量
+    @SerializedName("unitid")
     val unitid : String? = "",//单位id
+    @SerializedName("begindate")
     val begindate : String? = "",//开始交易日
+    @SerializedName("enddate")
     val enddate : String? = "",//结束交易日
+    @SerializedName("updatetime")
     val updatetime : String? = ""//更新时间
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ExpourseFutuDetailData.kt

@@ -2,30 +2,51 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 敞口期货报表明细实体
  */
 data class ExpourseFutuDetailData(
+    @SerializedName("accountid")
     val accountid : String? = "",//交易账户id
+    @SerializedName("accountname")
     val accountname : String? = "",//交易账户
+    @SerializedName("begindate")
     val begindate : String? = "",//开始交易日
+    @SerializedName("buyorsell")
     val buyorsell : String? = "",//方向 0-买 1-卖
+    @SerializedName("diffmgqty")
     val diffmgqty : String? = "",//套保品种今变化量
+    @SerializedName("diffneedqty")
     val diffneedqty : String? = "",//应套保总量变化量
+    @SerializedName("difftradeqty")
     val difftradeqty : String? = "",//交易品种今变化量
+    @SerializedName("enddate")
     val enddate : String? = "",//结束交易日
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("goodscode")
     val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品id
+    @SerializedName("goodsname")
     val goodsname : String? = "",//商品名称
+    @SerializedName("holdqty")
     val holdqty : String? = "",//期末持仓量
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保商品代码
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保商品id
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String? = "",//套保商品名称
+    @SerializedName("oriholdqty")
     val oriholdqty : String? = "",//期初持仓量
+    @SerializedName("todaycloseqty")
     val todaycloseqty : String? = "",//今平仓量
+    @SerializedName("todayopenqty")
     val todayopenqty : String? = "",//今开仓量
+    @SerializedName("tradedate")
     val tradedate : String? = ""//交易日
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FavoriteGoodsesData.kt

@@ -1,10 +1,13 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 自选商品信息，goodsid用逗号隔开
  * @property goodsid String
  * @constructor
  */
 data class FavoriteGoodsesData(
+    @SerializedName("goodsid")
     val goodsid : String = ""
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FinanceReportData.kt

@@ -2,44 +2,81 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //查询财务报表
 data class FinanceReportData(
+    @SerializedName("areauserid")
     val areauserid: String? = "",//所属机构\交易用户ID
+    @SerializedName("biztype")
     val biztype: String? = "",//业务类型 - 1:套保 2:套利
+    @SerializedName("buypreinvoicedamount")
     val buypreinvoicedamount: String? = "",//采购预收票额(预收票额)
+    @SerializedName("buyprepaidamount")
     val buyprepaidamount: String? = "",//采购预付款额(预付货款额)
+    @SerializedName("buytodayinvoiceamount")
     val buytodayinvoiceamount: String? = "",//采购今收票额(今收票额)
+    @SerializedName("buytodayrefundamount")
     val buytodayrefundamount: String? = "",//采购今收退款额(今收退款额)
+    @SerializedName("buytodaysettleamount")
     val buytodaysettleamount: String? = "",//采购今付款额(今付货款额)
+    @SerializedName("buyuninvoicedamount")
     val buyuninvoicedamount: String? = "",//采购应收票额(应收票额)
+    @SerializedName("buyunpaidamount")
     val buyunpaidamount: String? = "",//采购应付款额(应付货款额)
+    @SerializedName("currencyid")
     val currencyid: String? = "",//结算币种ID
+    @SerializedName("currencyname")
     val currencyname: String? = "",//币种名称
+    @SerializedName("cycletime")
     val cycletime: String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
     val cycletype: String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid: String? = "",//现货品种ID
+    @SerializedName("reckondate")
     val reckondate: String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("sellpreinvoicedamount")
     val sellpreinvoicedamount: String? = "",//销售预开票额(预开票额)
+    @SerializedName("sellprepaidamount")
     val sellprepaidamount: String? = "",//销售预收款额(预收货款额)
+    @SerializedName("selltodayinvoiceamount")
     val selltodayinvoiceamount: String? = "",//销售今开票额(今开票额)
+    @SerializedName("selltodayrefundamount")
     val selltodayrefundamount: String? = "",//销售今付退款额(今付退款额)
+    @SerializedName("selltodaysettleamount")
     val selltodaysettleamount: String? = "",//销售今收款额(今收货款额)
+    @SerializedName("selluninvoicedamount")
     val selluninvoicedamount: String? = "",//销售应开票额(应开票额)
+    @SerializedName("sellunpaidamount")
     val sellunpaidamount: String? = "",//销售应收款额(应收货款额)
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid: String? = "",//现货品牌ID
+    @SerializedName("todaypaysum")
     val todaypaysum: String? = "",//今付款合计
+    @SerializedName("todayreceivesum")
     val todayreceivesum: String? = "",//今收款合计
+    @SerializedName("updatetime")
     val updatetime: String? = "",//更新时间
+    @SerializedName("wrfactortypeid")
     val wrfactortypeid: String? = "",//仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("wrstandardid")
     val wrstandardid: String? = "",//现货商品ID
+    @SerializedName("begindate")
     val begindate : String? = "",//开始交易日
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("enddate")
     val enddate : String? = "",//结束交易日
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//品类代码
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//品类名称
+    @SerializedName("rightData")
     var rightData : List<String?>? = arrayListOf()//组装的右侧数据
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FinancialManageData.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 财务管理
@@ -29,33 +30,61 @@ import android.os.Parcelable
  * @constructor
  */
 data class FinancialManageData(
+    @SerializedName("applyid")
     val applyid : String? = "",
+    @SerializedName("applyname")
     val applyname : String? = "",
+    @SerializedName("applystatus")
     val applystatus : String? = "",
+    @SerializedName("applytime")
     val applytime : String? = "",
+    @SerializedName("auditname")
     val auditname : String? = "",
+    @SerializedName("audittime")
     val audittime : String? = "",
+    @SerializedName("buyusername")
     val buyusername : String? = "",
+    @SerializedName("contractno")
     val contractno : String? = "",
+    @SerializedName("contractstatus")
     val contractstatus : String? = "",
+    @SerializedName("contracttype")
     val contracttype : String? = "",
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",
+    @SerializedName("goodscode")
     val goodscode : String? = "",
+    @SerializedName("goodsname")
     val goodsname : String? = "",
+    @SerializedName("InvoiceAmount")
     val InvoiceAmount : String? = "",
+    @SerializedName("operateapplyid")
     val operateapplyid : String? = "",
+    @SerializedName("operateapplytype")
     val operateapplytype : String? = "",
+    @SerializedName("pricemove")
     val pricemove : String? = "",
+    @SerializedName("pricetype")
     val pricetype : String? = "",
+    @SerializedName("relatedid")
     val relatedid : String? = "",
+    @SerializedName("sellusername")
     val sellusername : String? = "",
+    @SerializedName("userid")
     val userid : String? = "",
+    @SerializedName("kxtype")
     val kxtype : String? = "",//款项类型 1-收付款(PayAmount字段有值) 2-退款(DeductAmount字段有值) 3-收付款/退款(2个字段都有)
+    @SerializedName("payamount")
     val payamount : String? = "",//收付款(非必填)
+    @SerializedName("indexSelect")
     var indexSelect : Int = 0,
+    @SerializedName("deductamount")
     val deductamount : String? = "",
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货品种
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货品种代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = ""//现货品种ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FinancialReportData.kt

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 财务报表 日报表 款项/发票 以及月报表等数据实体
  * @property applyid String?
@@ -38,47 +40,88 @@ package cn.muchinfo.rma.global.data
  */
 data class FinancialReportData(
     //查询财务日报表发票(菜单:报表查询/财务报表/日报表/发票/款项)
+    @SerializedName("applyid")
     val applyid : String? = "",//操作人
+    @SerializedName("applyname")
     val applyname : String? = "",//操作人名称
+    @SerializedName("biztype")
     val biztype : String? = "",//业务类型 - 1:套保计划 2:现货合同
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("contracttype")
     val contracttype : String? = "",//现货合同类型 - 1:采购 -1:销售
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种id
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("enumdicName")
     val enumdicName : String? = "",//单位名称
+    @SerializedName("logdatetime")
     val logdatetime : String? = "",//流水日期(时间)
+    @SerializedName("logid")
     val logid : String? = "",//流水ID(604+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("logtypename")
     val logtypename : String? = "",//合同类型(名称)
+    @SerializedName("logvalue")
     val logvalue : String? = "",//数值
+    @SerializedName("operatelogtype")
     val operatelogtype : String? = "",//操作流水类型 -
+    @SerializedName("optypename")
     val optypename : String? = "",//流水类型名称
+    @SerializedName("relatedid")
     val relatedid : String? = "",//现货合同ID\套保计划
+    @SerializedName("relatedno")
     val relatedno : String? = "",//合同编号
+    @SerializedName("tradedate")
     val tradedate : String? = "",//交易日(yyyyMMdd)
+    @SerializedName("userid")
     val userid : String? = "",//机构ID
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货商品代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货商品名称
     //查询现货日报表(菜单:报表查询/现货报表/现货日报表)  财务报表的头部数据
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构T
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//现货商品单位名称
+    @SerializedName("reckondate")
     val reckondate : String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("todaybuyreckonqty")
     val todaybuyreckonqty : String? = "",//采购确定量
+    @SerializedName("todaysellreckonqty")
     val todaysellreckonqty : String? = "",//销售确定量
+    @SerializedName("totalbuypricedqty")
     val totalbuypricedqty : String? = "",//采购定价量 = 期末 - 期初
+    @SerializedName("totalsellpricedqty")
     val totalsellpricedqty : String? = "",//销售定价量 = 期末 - 期初
     //查询财务月报表(菜单:报表查询/财务报表/月报表)
+    @SerializedName("collectinvoiceamount")
     val collectinvoiceamount : String? = "",//今日开票金额【汇总】
+    @SerializedName("collectinvoicecount")
     val collectinvoicecount : String? = "",//今日开票笔数【汇总】
+    @SerializedName("collectmoneyamount")
     val collectmoneyamount : String? = "",//今日收款金额【汇总】
+    @SerializedName("collectmoneycount")
     val collectmoneycount : String? = "",//今日收款笔数 【汇总】
+    @SerializedName("cycletime")
     val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
     val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @SerializedName("paymoneycount")
     val paymoneycount : String? = "",//今日付款笔数
+    @SerializedName("paymoneyamount")
     val paymoneyamount : String? = "",//今日付款金额
+    @SerializedName("payinvoicecount")
     val payinvoicecount : String? = "",//今日收票笔数
+    @SerializedName("payinvoiceamount")
     val payinvoiceamount : String? = "",//今日收票金额
+    @SerializedName("updatetime")
     val updatetime : String? = "",
+    @SerializedName("dayFr")
     val dayFr : List<FinancialReportData>? = arrayListOf()//日报表明细
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FutureDataReportData.kt

@@ -2,53 +2,97 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 期货报表
  */
 data class FutureDataReportData(
+    @SerializedName("accountid")
     val accountid : String? = "",//交易账户
+    @SerializedName("accountname")
     val accountname : String? = "",//交易账号名称
+    @SerializedName("begindate")
     val begindate : String? = "",//开始交易日
+    @SerializedName("buyorsell")
     val buyorsell : String? = "",//持仓方向
+    @SerializedName("charge")
     val charge : String? = "",//手续费
+    @SerializedName("closepl")
     val closepl : String? = "",//平仓损益
+    @SerializedName("currencyid")
     val currencyid : String? = "",//结算币种ID
+    @SerializedName("cycletime")
     val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
     val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @SerializedName("enddate")
     val enddate : String? = "",//结束交易日
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称(现货商品)
+    @SerializedName("floatpl")
     val floatpl : String? = "",//浮动损益
+    @SerializedName("goodscode")
     val goodscode : String? = "",//交易合约代码
+    @SerializedName("goodsgroupid")
     val goodsgroupid : String? = "",//交易品种
+    @SerializedName("goodsgroupname")
     val goodsgroupname : String? = "",//交易品种名称
+    @SerializedName("goodsgroupspotqty")
     val goodsgroupspotqty : String? = "",//交易品种期末量 (= 期末持仓量 * 合约乘数)
+    @SerializedName("goodsid")
     val goodsid : String? = "",//交易合约
+    @SerializedName("goodsname")
     val goodsname : String? = "",//交易合约名称
+    @SerializedName("goodunitid")
     val goodunitid : String? = "",//交易合约单位id
+    @SerializedName("holdamount")
     val holdamount : String? = "",//期末持仓额
+    @SerializedName("holdqty")
     val holdqty : String? = "",//期末持仓量
+    @SerializedName("lastholdamount")
     val lastholdamount : String? = "",//当前持仓额
+    @SerializedName("lastprice")
     val lastprice : String? = "",//最新价
+    @SerializedName("middlegoodsqty")
     val middlegoodsqty : String? = "",//套保品种期末量 (=交易品种期末量 * 期货品种折算系数)
+    @SerializedName("openamount")
     val openamount : String? = "",//期末开仓额
+    @SerializedName("oriholdamount")
     val oriholdamount : String? = "",//期初持仓额
+    @SerializedName("oriholdqty")
     val oriholdqty : String? = "",//期初持仓量
+    @SerializedName("oriopenamount")
     val oriopenamount : String? = "",//期初开仓额
+    @SerializedName("outergroupcode")
     val outergroupcode : String? = "",//交易品种代码
+    @SerializedName("reckondate")
     val reckondate : String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("reckonholdamount")
     val reckonholdamount : String? = "",//结算持仓额
+    @SerializedName("reckonpl")
     val reckonpl : String? = "",//结算损益
+    @SerializedName("reckonpl2")
     val reckonpl2 : String? = "",//结算逐笔盈亏
+    @SerializedName("reckonprice")
     val reckonprice : String? = "",//结算价
+    @SerializedName("relateduserid")
     val relateduserid : String? = "",//账户关联用户ID
+    @SerializedName("todaycloseamount")
     val todaycloseamount : String? = "",//今平仓额
+    @SerializedName("todaycloseqty")
     val todaycloseqty : String? = "",//今平仓量
+    @SerializedName("todaygoodsgroupspotqty")
     val todaygoodsgroupspotqty : String? = "",//交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
+    @SerializedName("todaymiddlegoodsqty")
     val todaymiddlegoodsqty : String? = "",//套保品种变化量 (= 交易品种变化量*期货品种折算系数)
+    @SerializedName("todayopenamount")
     val todayopenamount : String? = "",//今开仓额
+    @SerializedName("todayopenqty")
     val todayopenqty : String? = "",//今开仓量
+    @SerializedName("userid")
     val userid : String? = "",//账户所属用户ID
+    @SerializedName("rightData")
     var rightData : List<String?>? = arrayListOf()//组装的右侧数据
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FutureDetailsData.kt

@@ -1,55 +1,57 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 期货单据的综合实体包括成交单委托单和持仓头寸
  */
 data class FutureDetailsData(
-    val accountid: String = "",//账户ID
-    val buyorsell: String = "",//买卖 - 0:买 1:卖
-    val channelbuildtype: String = "",//开平标志 - 0:无 1:建仓 2:平仓
-    val channelinnerorderstatus: String = "",//委托状态 - 1:委托请求 2:冻结成功 3:委托失败 4:委托部成部失败 5:委托成功 6:全部撤销 7:部成部撤 8:部成部撤部失败 9:全部成交
-    val channeloperatetype: String = "",//操作类型 - 1:正常委托 2:斩仓委托 3:强平委托
-    val closetype: String = "",//平仓方式 - 0:无 1:平今 2:平昨
-    val curexchangerate: String = "",//当前汇率
-    val exchangefullname: String = "",//外部交易所全称
-    val goodscode: String = "",//商品代码(内部)
-    val goodsid: String = "",//商品ID
-    val goodsname: String = "",//商品名称
-    val marketid: String = "",//市场ID
-    val openfreezemargin: String = "",//冻结保证金(冻结交易金额)
+    @SerializedName("accountid") val accountid: String = "",//账户ID
+    @SerializedName("buyorsell") val buyorsell: String = "",//买卖 - 0:买 1:卖
+    @SerializedName("channelbuildtype") val channelbuildtype: String = "",//开平标志 - 0:无 1:建仓 2:平仓
+    @SerializedName("channelinnerorderstatus") val channelinnerorderstatus: String = "",//委托状态 - 1:委托请求 2:冻结成功 3:委托失败 4:委托部成部失败 5:委托成功 6:全部撤销 7:部成部撤 8:部成部撤部失败 9:全部成交
+    @SerializedName("channeloperatetype") val channeloperatetype: String = "",//操作类型 - 1:正常委托 2:斩仓委托 3:强平委托
+    @SerializedName("closetype") val closetype: String = "",//平仓方式 - 0:无 1:平今 2:平昨
+    @SerializedName("curexchangerate") val curexchangerate: String = "",//当前汇率
+    @SerializedName("exchangefullname") val exchangefullname: String = "",//外部交易所全称
+    @SerializedName("goodscode") val goodscode: String = "",//商品代码(内部)
+    @SerializedName("goodsid") val goodsid: String = "",//商品ID
+    @SerializedName("goodsname") val goodsname: String = "",//商品名称
+    @SerializedName("marketid") val marketid: String = "",//市场ID
+    @SerializedName("openfreezemargin") val openfreezemargin: String = "",//冻结保证金(冻结交易金额)
 
-    val orderid: String = "",//委托单号(107+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-    val orderprice: String = "",//委托价格(账户)
-    val orderqty: String = "",//委托数量
-    val ordertime: String = "",//委托时间
-    val pricemode: String = "",//取价方式 - 1:市价 2: 限价
-    val tradedate: String = "",//交易日(yyyyMMdd)
-    val tradeqty: String = "",//成交数量
+    @SerializedName("orderid") val orderid: String = "",//委托单号(107+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+    @SerializedName("orderprice") val orderprice: String = "",//委托价格(账户)
+    @SerializedName("orderqty") val orderqty: String = "",//委托数量
+    @SerializedName("ordertime") val ordertime: String = "",//委托时间
+    @SerializedName("pricemode") val pricemode: String = "",//取价方式 - 1:市价 2: 限价
+    @SerializedName("tradedate") val tradedate: String = "",//交易日(yyyyMMdd)
+    @SerializedName("tradeqty") val tradeqty: String = "",//成交数量
 
-    val closecharge: String = "",//平仓手续费(账户)
-    val closecharge2: String = "",//平仓手续费(商品)
-    val opencharge: String = "",//建仓手续费(账户)
-    val opencharge2: String = "",//建仓手续费(商品)
-    val tradeamount: String = "",//成交金额(账户)
+    @SerializedName("closecharge") val closecharge: String = "",//平仓手续费(账户)
+    @SerializedName("closecharge2") val closecharge2: String = "",//平仓手续费(商品)
+    @SerializedName("opencharge") val opencharge: String = "",//建仓手续费(账户)
+    @SerializedName("opencharge2") val opencharge2: String = "",//建仓手续费(商品)
+    @SerializedName("tradeamount") val tradeamount: String = "",//成交金额(账户)
 
-    val tradeid: String = "",//成交单号(108+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-    val tradeprice: String = "",//成交价格
-    val tradetime: String = "",//成交时间
-    val agreeunit: String = "",//合约单位
-    val curpositionqty: String = "",//持仓（总仓数量, 期末头寸）
-    val curtdposition: String = "",//今仓数量（期末今日头寸）
-    val curtdpositionenabled: String = "",//今仓可用
-    val decimalplace: String = "",//报价小数位
-    val enableqty: String = "",//可用（总仓可用）
-    val exexchangename: String = "",//外部交易所名称
-    val last: String = "",//现价
-    val openaverageprice: String = "",//开仓均价【头寸变化更新】 = 开仓成本 / 期末头寸 / 合约单位
-    val opencost: String = "",//开仓成本
-    val openpl: String = "",//逐笔浮盈【实时行情更新】（MTP：开仓盈亏、平仓盈亏） 买方向 = (最新价 - 开仓均价) * 买期末头寸 * 合约单位；卖方向 = (开仓均价 - 最新价) * 卖期末头寸 * 合约单位
-    val outgoodscode: String = "",//商品代码(外部)
-    val positionaverageprice: String = "",//持仓均价【头寸变化更新】= 持仓成本 / 期末头寸 / 合约单位
-    val positioncost: String = "",//持仓成本
-    val positionpl: String = "",//盯市浮盈【实时行情更新】（MTP：浮动盈亏、持仓盈亏） 买方向 = (最新价 - 持仓均价) * 买期末头寸 * 合约单位；卖方向 = (持仓均价 - 最新价) * 卖期末头寸 * 合约单位
-    val positionplrate: String = "",//持仓盈亏比例【实时行情更新】 = 持仓盈亏 / 开仓成本
-    val usedmargin: String = ""//占用保证金
+    @SerializedName("tradeid") val tradeid: String = "",//成交单号(108+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+    @SerializedName("tradeprice") val tradeprice: String = "",//成交价格
+    @SerializedName("tradetime") val tradetime: String = "",//成交时间
+    @SerializedName("agreeunit") val agreeunit: String = "",//合约单位
+    @SerializedName("curpositionqty") val curpositionqty: String = "",//持仓（总仓数量, 期末头寸）
+    @SerializedName("curtdposition") val curtdposition: String = "",//今仓数量（期末今日头寸）
+    @SerializedName("curtdpositionenabled") val curtdpositionenabled: String = "",//今仓可用
+    @SerializedName("decimalplace") val decimalplace: String = "",//报价小数位
+    @SerializedName("enableqty") val enableqty: String = "",//可用（总仓可用）
+    @SerializedName("exexchangename") val exexchangename: String = "",//外部交易所名称
+    @SerializedName("last") val last: String = "",//现价
+    @SerializedName("openaverageprice") val openaverageprice: String = "",//开仓均价【头寸变化更新】 = 开仓成本 / 期末头寸 / 合约单位
+    @SerializedName("opencost") val opencost: String = "",//开仓成本
+    @SerializedName("openpl") val openpl: String = "",//逐笔浮盈【实时行情更新】（MTP：开仓盈亏、平仓盈亏） 买方向 = (最新价 - 开仓均价) * 买期末头寸 * 合约单位；卖方向 = (开仓均价 - 最新价) * 卖期末头寸 * 合约单位
+    @SerializedName("outgoodscode") val outgoodscode: String = "",//商品代码(外部)
+    @SerializedName("positionaverageprice") val positionaverageprice: String = "",//持仓均价【头寸变化更新】= 持仓成本 / 期末头寸 / 合约单位
+    @SerializedName("positioncost") val positioncost: String = "",//持仓成本
+    @SerializedName("positionpl") val positionpl: String = "",//盯市浮盈【实时行情更新】（MTP：浮动盈亏、持仓盈亏） 买方向 = (最新价 - 持仓均价) * 买期末头寸 * 合约单位；卖方向 = (持仓均价 - 最新价) * 卖期末头寸 * 合约单位
+    @SerializedName("positionplrate") val positionplrate: String = "",//持仓盈亏比例【实时行情更新】 = 持仓盈亏 / 开仓成本
+    @SerializedName("usedmargin") val usedmargin: String = ""//占用保证金
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/FuturesCompanyData.kt

@@ -2,25 +2,41 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 期货公司
  */
 data class FuturesCompanyData(
+    @SerializedName("brokerid")
     val brokerid : String? = "",//经纪公司代码
+    @SerializedName("channeladdress")
     val channeladdress : String? = "",//对冲渠道服务地址(多个地址用逗号分隔) – 192.168.30.10:3000,192.168.30.10:3001
+    @SerializedName("channelid")
     val channelid : String? = "",//对冲渠道ID
+    @SerializedName("createtime")
     val createtime : String? = "",//创建时间
+    @SerializedName("creatorid")
     val creatorid : String? = "",//创建人
+    @SerializedName("fcid")
     val fcid : String? = "",//期货公司ID(SEQ_ERMCP_FUTURESCOMPANY)
+    @SerializedName("fcname")
     val fcname : String? = "",//期货公司名称
+    @SerializedName("isvalid")
     val isvalid : String? = "",//是否有效 - 0:无效 1:有效
+    @SerializedName("mhpaddress")
     val mhpaddress : String? = "",//MHP服务地址(IP:Port)
+    @SerializedName("riskrulegroupid")
     val riskrulegroupid : String? = "",//风控规则组ID
+    @SerializedName("tradefeetmpid")
     val tradefeetmpid : String? = "",//手续费模板ID[TradeConfigTmpType为2]
+    @SerializedName("trademargintmpid")
     val trademargintmpid : String? = "",//保证金模板ID [TradeConfigTmpType为1]
+    @SerializedName("traderatetmpid")
     val traderatetmpid : String? = "",//汇率模板ID[TradeConfigTmpType为3]
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
+    @SerializedName("updatorid")
     val updatorid : String? = ""//更新人
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GGConvertConfigData.kt

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 查询期货品种配置(菜单:商品信息/期货品种)
  * @property convertratio String?  折算系数
@@ -16,18 +18,32 @@ package cn.muchinfo.rma.global.data
  * @constructor
  */
 data class GGConvertConfigData(
+    @SerializedName("convertratio")
     val convertratio : String? = "",//折算系数
+    @SerializedName("destgoodsgroupid")
     val destgoodsgroupid : String? = "",//目标品种ID
+    @SerializedName("dstcode")
     val dstcode : String? = "",//目录品种代码
+    @SerializedName("dstexchangecode")
     val dstexchangecode : String? = "",//目标期货交易所
+    @SerializedName("dstname")
     val dstname : String? = "",//目标品种名称
+    @SerializedName("dstunitid")
     val dstunitid : String? = "",//目标品种单位ID
+    @SerializedName("dstunitidname")
     val dstunitidname : String? = "",//目标品种单位名称
+    @SerializedName("modifytime")
     val modifytime : String? = "",//修改时间
+    @SerializedName("srccode")
     val srccode : String? = "",//源品种代码
+    @SerializedName("srcexchangecode")
     val srcexchangecode : String? = "",//源期货交易所
+    @SerializedName("srcgoodsgroupid")
     val srcgoodsgroupid : String? = "",//源品种ID
+    @SerializedName("srcname")
     val srcname : String? = "",//源品种名称
+    @SerializedName("srcunitid")
     val srcunitid : String? = "",//源品种单位ID
+    @SerializedName("srcunitidname")
     val srcunitidname : String? = ""//源品种单位名称
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsExInfoData.kt

@@ -19,9 +19,12 @@ import com.google.gson.annotations.SerializedName
  * @constructor
  */
 data class GoodsExInfoData(
-    @SerializedName("canfinance") val canfinance : String? = "",//是否支持融资 - 0:不支持 1:支持【69:铂金宝】
-    @SerializedName("canregularlybuy") val canregularlybuy : String? = "",//是否支持定投 - 0:不支持 1:支持【69:铂金宝】
-    @SerializedName("defaulttradeuserid") val defaulttradeuserid : String? = "",//默认交易用户ID
+    @SerializedName("canfinance")
+    val canfinance : String? = "",//是否支持融资 - 0:不支持 1:支持【69:铂金宝】
+    @SerializedName("canregularlybuy")
+    val canregularlybuy : String? = "",//是否支持定投 - 0:不支持 1:支持【69:铂金宝】
+    @SerializedName("defaulttradeuserid")
+    val defaulttradeuserid : String? = "",//默认交易用户ID
     val deliverygoodsid : String? = "",//现货品种ID
     @SerializedName("goodsid")
     val goodsid : String? = "",//商品ID(自增ID SEQ_GOODS)

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsGroupData.kt

@@ -1,32 +1,59 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 查询期货商品组
  */
 data class GoodsGroupData(
+    @SerializedName("agreeunit")
     val agreeunit: String? = "",//合约单位
+    @SerializedName("areauserid")
     val areauserid: String? = "",//所属机构id(套保品是有areauserid的,当要排除已配置商品组时需要areauserid过滤)
+    @SerializedName("canshort")
     val canshort: String? = "",//是否允许做空[通道交易] - 0:不能做空 1:可以做空
+    @SerializedName("closepricemode")
     val closepricemode: String? = "",//强平价格方式 - 1:市价 2:最新价 3:涨跌停（未实现）
+    @SerializedName("createtime")
     val createtime: String? = "",//创建时间
+    @SerializedName("creatorid")
     val creatorid: String? = "",//创建人
+    @SerializedName("currencyid")
     val currencyid: String? = "",//报价货币ID
+    @SerializedName("decimalplace")
     val decimalplace: String? = "",//报价小数位
+    @SerializedName("excludecfg")
     val excludecfg: String? = "",//排除套保品已配置期货分类下的商品组(但显示已配置商品组) 1-排除
+    @SerializedName("exexchangeid")
     val exexchangeid: String? = "",//外部交易所ID[通道交易]
+    @SerializedName("goodsgroupid")
     val goodsgroupid: String? = "",//商品组ID(自增ID)
+    @SerializedName("goodsgroupname")
     val goodsgroupname: String? = "",//商品组名称
+    @SerializedName("goodsgroupstatus")
     val goodsgroupstatus: String? = "",//商品组状态 - 1:正常 2:注销
+    @SerializedName("goodunitid")
     val goodunitid: String? = "",//报价单位ID
+    @SerializedName("groupcategroyid")
     val groupcategroyid: String? = "",//品种分类ID
+    @SerializedName("innerdealmode")
     val innerdealmode: String? = "",//内部成交方式[通道交易] - 1:净头寸 2:开平 3:平今
+    @SerializedName("marketid")
     val marketid: String? = "",//所属市场ID
+    @SerializedName("modifierid")
     val modifierid: String? = "",//修改人
+    @SerializedName("modifytime")
     val modifytime: String? = "",//修改时间
+    @SerializedName("outerdealmode")
     val outerdealmode: String? = "",//外部成交方式[通道交易]- 1:净头寸 2:开平 3:平今
+    @SerializedName("outergroupcode")
     val outergroupcode: String? = "",//外部商品组代码[通道交易]
+    @SerializedName("quoteminunit")
     val quoteminunit: String? = "",//行情最小变动单位 [整数，报价小数位一起使用]
+    @SerializedName("quotesourcegroupid")
     val quotesourcegroupid: String? = "",//所属行情源分组ID[参考行情市场用\通道交易]
+    @SerializedName("syncgoodsqty")
     val syncgoodsqty: String? = "",//同步合约数[通道交易-投资管理用] - 0表示不限
+    @SerializedName("enumdicname")
     val enumdicname : String? = ""//单位名称
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsInfoAndQuotes.kt

@@ -1,6 +1,7 @@
 package cn.muchinfo.rma.global.data
 
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
+import com.google.gson.annotations.SerializedName
 
 /**
  * 包含商品信息和goodscode和盘面信息的实体类
@@ -10,7 +11,10 @@ import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
  * @constructor
  */
 data class GoodsInfoAndQuotes(
+    @SerializedName("goodsInfo")
     var goodsInfo : GoodsInfo = GoodsInfo(),
+    @SerializedName("outgoodscode")
     var outgoodscode : String = "",
+    @SerializedName("quoteDayData")
     var quoteDayData: QuoteDayData = QuoteDayData()
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsPickupData.kt

@@ -2,60 +2,61 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 data class GoodsPickupData(
-    val accountid : String? = "",//账户ID
-    val address : String? = "",//提货人详细地址
-    val amount : String? = "",//提货金额
-    val artradedate : String? = "",//自动收货交易日(yyyyMMdd)
-    val auditer : String? = "",//审核人
-    val auditsrc : String? = "",//更新来源 - 1:管理端 2:终端
-    val audittime : String? = "",//审核时间(发货时间)
-    val audittradedate : String? = "",//审核交易日(yyyyMMdd)
-    val cardnum : String? = "",//提货人证件号码
-    val cardtypeid : String? = "",//提货人证件类型
-    val checkremark : String? ="",//审核备注
-    val cityid : String? = "",//市
-    val cityname: String? = "",//城市名称
-    val countryid : String? ="",//国家
-    val countryname : String? = "",//国家名称
-    val districtid : String? = "",//地区
-    val districtname : String? = "",//地区名称
-    val enumdicname : String?  ="",//单位名称(提货商品)
-    val expresscompany : String? = "",//物流公司
-    val expressnum : String? = "",//物流单号
-    val goodsagreeunit : String? = "",//交易商品乘数
-    val goodscode : String? = "",//商品代码
-    val goodsid : String?  ="",//商品ID
-    val goodsname : String? = "",//商品名称
-    val goodsqty : String? = "",//交易商品手数(69模式按成交量小数位放大取整)
-    val handlestatus : String? = "",//处理状态
-    val marketid : String?  ="",//市场ID
-    val phonenum : String? = "",//提货人联系方式
-    val pickupgoodsagreeunit : String? = "",//提货商品合约乘数
-    val pickupgoodsid : String? = "",//提货商品ID
-    val pickupgoodsname : String? = "",//提货商品名称
-    val pickupgoodsqty : String? = "",//提货商品手数(数量)
-    val pickupgoodsunitid : String? = "",//单位ID(提货商品)
-    val pickupratio : String? ="",//提货系数
-    val preparedays : String? = "",//备货期(天)-提货单明细表
-    val provinceid : String? = "",//省
-    val provincename : String? = "",//省名称
-    val qty : String? = "",//交易商品总手数(交易商品 - 69模式按成交量放大) - 明细表的交易商品手数汇总
-    val recivername : String? = "",//提货人姓名
-    val reqtime : String? = "",//提货申请时间
-    val storeuserid : String? = "",//门店用户ID (千海金)
-    val storeusername : String? = "",//门店用户名称
-    val takemode : String? = "",//提货方式 - 2:自提 3:配送(邮寄)
-    val takeorderid : String? = "",//提货单号(905+Unix秒时间戳(10位)+xxxxxx)
-    val takeorderstatus : String? = "",//提货状态 - 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
-    val takeremark : String? = "",//提货备注
-    val tradedate : String? = "",//交易日(yyyyMMdd)
-    val updatetime : String? = "",//更新时间
-    val confirmtime : String? = "",//取货时间 或 收货时间
-    val userid : String? = "",//用户ID
+    @SerializedName("accountid") val accountid : String? = "",//账户ID
+    @SerializedName("address") val address : String? = "",//提货人详细地址
+    @SerializedName("amount") val amount : String? = "",//提货金额
+    @SerializedName("artradedate") val artradedate : String? = "",//自动收货交易日(yyyyMMdd)
+    @SerializedName("auditer") val auditer : String? = "",//审核人
+    @SerializedName("auditsrc") val auditsrc : String? = "",//更新来源 - 1:管理端 2:终端
+    @SerializedName("audittime") val audittime : String? = "",//审核时间(发货时间)
+    @SerializedName("audittradedate") val audittradedate : String? = "",//审核交易日(yyyyMMdd)
+    @SerializedName("cardnum") val cardnum : String? = "",//提货人证件号码
+    @SerializedName("cardtypeid") val cardtypeid : String? = "",//提货人证件类型
+    @SerializedName("checkremark") val checkremark : String? ="",//审核备注
+    @SerializedName("cityid") val cityid : String? = "",//市
+    @SerializedName("cityname") val cityname: String? = "",//城市名称
+    @SerializedName("countryid") val countryid : String? ="",//国家
+    @SerializedName("countryname") val countryname : String? = "",//国家名称
+    @SerializedName("districtid") val districtid : String? = "",//地区
+    @SerializedName("districtname") val districtname : String? = "",//地区名称
+    @SerializedName("enumdicname") val enumdicname : String?  ="",//单位名称(提货商品)
+    @SerializedName("expresscompany") val expresscompany : String? = "",//物流公司
+    @SerializedName("expressnum") val expressnum : String? = "",//物流单号
+    @SerializedName("goodsagreeunit") val goodsagreeunit : String? = "",//交易商品乘数
+    @SerializedName("goodscode") val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid") val goodsid : String?  ="",//商品ID
+    @SerializedName("goodsname") val goodsname : String? = "",//商品名称
+    @SerializedName("goodsqty") val goodsqty : String? = "",//交易商品手数(69模式按成交量小数位放大取整)
+    @SerializedName("handlestatus") val handlestatus : String? = "",//处理状态
+    @SerializedName("marketid") val marketid : String?  ="",//市场ID
+    @SerializedName("phonenum") val phonenum : String? = "",//提货人联系方式
+    @SerializedName("pickupgoodsagreeunit") val pickupgoodsagreeunit : String? = "",//提货商品合约乘数
+    @SerializedName("pickupgoodsid") val pickupgoodsid : String? = "",//提货商品ID
+    @SerializedName("pickupgoodsname") val pickupgoodsname : String? = "",//提货商品名称
+    @SerializedName("pickupgoodsqty") val pickupgoodsqty : String? = "",//提货商品手数(数量)
+    @SerializedName("pickupgoodsunitid") val pickupgoodsunitid : String? = "",//单位ID(提货商品)
+    @SerializedName("pickupratio") val pickupratio : String? ="",//提货系数
+    @SerializedName("preparedays") val preparedays : String? = "",//备货期(天)-提货单明细表
+    @SerializedName("provinceid") val provinceid : String? = "",//省
+    @SerializedName("provincename") val provincename : String? = "",//省名称
+    @SerializedName("qty") val qty : String? = "",//交易商品总手数(交易商品 - 69模式按成交量放大) - 明细表的交易商品手数汇总
+    @SerializedName("recivername") val recivername : String? = "",//提货人姓名
+    @SerializedName("reqtime") val reqtime : String? = "",//提货申请时间
+    @SerializedName("storeuserid") val storeuserid : String? = "",//门店用户ID (千海金)
+    @SerializedName("storeusername") val storeusername : String? = "",//门店用户名称
+    @SerializedName("takemode") val takemode : String? = "",//提货方式 - 2:自提 3:配送(邮寄)
+    @SerializedName("takeorderid") val takeorderid : String? = "",//提货单号(905+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("takeorderstatus") val takeorderstatus : String? = "",//提货状态 - 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
+    @SerializedName("takeremark") val takeremark : String? = "",//提货备注
+    @SerializedName("tradedate") val tradedate : String? = "",//交易日(yyyyMMdd)
+    @SerializedName("updatetime") val updatetime : String? = "",//更新时间
+    @SerializedName("confirmtime") val confirmtime : String? = "",//取货时间 或 收货时间
+    @SerializedName("userid") val userid : String? = "",//用户ID
     var isClick : Int = 0,//是否点击展开
-    val username : String? = ""//用户名称
+    @SerializedName("username") val username : String? = ""//用户名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsRuleData.java

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global.data;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * Created by simonzhou on 18/3/20.
  * 商品规则类型
@@ -10,9 +12,13 @@ package cn.muchinfo.rma.global.data;
  */
 
 public class GoodsRuleData {
+    @SerializedName("ruleid")
     private int ruleid;
+    @SerializedName("goodsid")
     private int goodsid;
+    @SerializedName("ruleName")
     private String ruleName;
+    @SerializedName("paramValue")
     private double paramValue;
 
     public int getRuleid() {

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsWrstandardData.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 查询商品品类 Ermcp3
@@ -25,23 +26,40 @@ import android.os.Parcelable
  * @constructor
  */
 data class GoodsWrstandardData(
-    val areauserid : String? = "",//所属机构
-    val convertfactor : String? = "",//标仓系数
-    val createtime : String? = "",//创建时间
-    val creatorid : String? = "",//创建人
-    val deliverygoodsid : String? = "",//现货品种ID
-    val enumdicname : String? = "",//品类单位名称
-    val isvalid : String? = "",//是否有效 0-无效(停用) 1-有效(正常)
-    val minivalue : String? = "",//最小变动值
-    val minivaluedp : String? = "",//最小变动值小数位
-    val realminivalue : String? = "",//实际最小变动值
-    val realminivaluedp : String? = "",//实际最小变动值小数位
-    val remark : String? = "",//备注
-    val unitid : String? = "",//品类单位ID
-    val updatetime : String? = "",//更新时间
-    val wrstandardcode : String? = "",//品类代码
-    val wrstandardid : String? = "",//品类ID(SEQ_WRSTANDARD)
-    val wrstandardname : String? = ""//品类名称
+    @SerializedName("areauserid")
+    val areauserid: String? = "",//所属机构
+    @SerializedName("convertfactor")
+    val convertfactor: String? = "",//标仓系数
+    @SerializedName("createtime")
+    val createtime: String? = "",//创建时间
+    @SerializedName("creatorid")
+    val creatorid: String? = "",//创建人
+    @SerializedName("deliverygoodsid")
+    val deliverygoodsid: String? = "",//现货品种ID
+    @SerializedName("enumdicname")
+    val enumdicname: String? = "",//品类单位名称
+    @SerializedName("isvalid")
+    val isvalid: String? = "",//是否有效 0-无效(停用) 1-有效(正常)
+    @SerializedName("minivalue")
+    val minivalue: String? = "",//最小变动值
+    @SerializedName("minivaluedp")
+    val minivaluedp: String? = "",//最小变动值小数位
+    @SerializedName("realminivalue")
+    val realminivalue: String? = "",//实际最小变动值
+    @SerializedName("realminivaluedp")
+    val realminivaluedp: String? = "",//实际最小变动值小数位
+    @SerializedName("remark")
+    val remark: String? = "",//备注
+    @SerializedName("unitid")
+    val unitid: String? = "",//品类单位ID
+    @SerializedName("updatetime")
+    val updatetime: String? = "",//更新时间
+    @SerializedName("wrstandardcode")
+    val wrstandardcode: String? = "",//品类代码
+    @SerializedName("wrstandardid")
+    val wrstandardid: String? = "",//品类ID(SEQ_WRSTANDARD)
+    @SerializedName("wrstandardname")
+    val wrstandardname: String? = ""//品类名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

RMA/app/src/main/java/cn/muchinfo/rma/global/data/HedgePlanData.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  *
@@ -23,34 +24,35 @@ import android.os.Parcelable
  * @constructor
  */
 data class HedgePlanData(
-    val areauserid : String? = "",
-    val contracttype : String? = "",
-    val convertfactor : String? = "",
-    val deliverygoodsid : String? = "",
-    val deliverygoodsname : String? = "",
-    val hedgeplanid : String? = "",
-    val hedgeplanno : String? = "",
-    val hedgeplanstatus : String? = "",
-    val planqty :String? = "",
-    val plantime  : String? = "",
-    val producttype : String? = "",
-    val remark : String? = "",
-    val spotgoodsdesc :String? = "",
-    val wrstandardid : String? = "",
-    val wrstandardname : String? = "",
+
+    @SerializedName("areauserid") val areauserid : String? = "",
+    @SerializedName("contracttype") val contracttype : String? = "",
+    @SerializedName("convertfactor") val convertfactor : String? = "",
+    @SerializedName("deliverygoodsid") val deliverygoodsid : String? = "",
+    @SerializedName("deliverygoodsname") val deliverygoodsname : String? = "",
+    @SerializedName("hedgeplanid") val hedgeplanid : String? = "",
+    @SerializedName("hedgeplanno") val hedgeplanno : String? = "",
+    @SerializedName("hedgeplanstatus") val hedgeplanstatus : String? = "",
+    @SerializedName("planqty") val planqty :String? = "",
+    @SerializedName("plantime") val plantime  : String? = "",
+    @SerializedName("producttype") val producttype : String? = "",
+    @SerializedName("remark") val remark : String? = "",
+    @SerializedName("spotgoodsdesc") val spotgoodsdesc :String? = "",
+    @SerializedName("wrstandardid") val wrstandardid : String? = "",
+    @SerializedName("wrstandardname") val wrstandardname : String? = "",
     var indexSelect : Int = 0,
-    val unitid : String? = "",//单位id
-    val deliverygoodscode : String? = "",//现货品种代码
-    val enumdicname : String? = "",//单位
-    val audittime : String? = "",//审核时间
-    val createtime : String? = "",//创建时间
-    val updatetime : String? = "",//更新时间
-    val currencyid : String? = "",//币种id
-    val currencyname : String? = "",//币种名称
-    val tradeuserid : String? = "",//交易用户id
-    val wrunitidame : String? = "",//品类单位名称
-    val wrunitid : String? = "",//
-    val tradeusername : String? = ""//交易用户名称
+    @SerializedName("unitid") val unitid : String? = "",//单位id
+    @SerializedName("deliverygoodscode") val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("enumdicname") val enumdicname : String? = "",//单位
+    @SerializedName("audittime") val audittime : String? = "",//审核时间
+    @SerializedName("createtime") val createtime : String? = "",//创建时间
+    @SerializedName("updatetime") val updatetime : String? = "",//更新时间
+    @SerializedName("currencyid") val currencyid : String? = "",//币种id
+    @SerializedName("currencyname") val currencyname : String? = "",//币种名称
+    @SerializedName("tradeuserid") val tradeuserid : String? = "",//交易用户id
+    @SerializedName("wrunitidame") val wrunitidame : String? = "",//品类单位名称
+    @SerializedName("wrunitid") val wrunitid : String? = "",//
+    @SerializedName("tradeusername") val tradeusername : String? = ""//交易用户名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

RMA/app/src/main/java/cn/muchinfo/rma/global/data/MiddleGoodsChangeLogData.kt

@@ -1,17 +1,33 @@
 package cn.muchinfo.rma.global.data
+
+import com.google.gson.annotations.SerializedName
+
 //查询套保品种变更记录(菜单:套保品种/商品详情/变更记录)
 data class MiddleGoodsChangeLogData(
+    @SerializedName("aftervalue")
     val aftervalue: String = "",//变更后
+    @SerializedName("applyid")
     val applyid: String = "",//操作人
+    @SerializedName("applyname")
     val applyname: String = "",//操作人名称
+    @SerializedName("applysrc")
     val applysrc: String = "",//操作来源 - 1:管理端 2:终端
+    @SerializedName("beforevalue")
     val beforevalue: String = "",//变更前
+    @SerializedName("changelogtype")
     val changelogtype: String = "",//变更流水类型 - 1:套保比率变更
+    @SerializedName("handlestatus")
     val handlestatus: String = "",//处理状态
+    @SerializedName("logdatetime")
     val logdatetime: String = "",//流水日期
+    @SerializedName("logid")
     val logid: String = "",//流水ID
+    @SerializedName("logremark")
     val logremark: String = "",//流水备注
+    @SerializedName("middlegoodsid")
     val middlegoodsid: String = "",//套保品种ID
+    @SerializedName("tradedate")
     val tradedate: String = "",//交易日(yyyyMMdd)
+    @SerializedName("updatetime")
     val updatetime: String = ""//更新时间
 )

RMA/app/src/main/java/cn/muchinfo/rma/global/data/MiddleGoodsData.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 套保品种
@@ -21,21 +22,37 @@ import android.os.Parcelable
  * @constructor
  */
 data class MiddleGoodsData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",
+    @SerializedName("evaluateratio")
     val evaluateratio : String? = "",
+    @SerializedName("goodsgroupid")
     val goodsgroupid : String? = "",
+    @SerializedName("isvalid")
     val isvalid : String? = "",
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String? = "",
+    @SerializedName("modifytime")
     val modifytime : String? = "",
+    @SerializedName("needhedgeratio")
     val needhedgeratio : String? = "",
+    @SerializedName("qtydecimalplace")
     val qtydecimalplace : String? = "",
+    @SerializedName("relatedgoodsid")
     val relatedgoodsid : String? = "",
+    @SerializedName("relatedgoodstype")
     val relatedgoodstype : String? = "",
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0,
+    @SerializedName("id")
     var id : String? = "",//用来区分的id
+    @SerializedName("createtime")
     val createtime : String? = ""
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/MiddleGoodsDetail.kt

@@ -2,13 +2,20 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 data class MiddleGoodsDetail(
+    @SerializedName("isAllSelect")
     var isAllSelect : Int = 0,//是否全部展开
+    @SerializedName("isFutureTypeSelect")
     var isFutureTypeSelect : Int = 1,//期货品种是否展开
+    @SerializedName("isSpotTypeSelect")
     var isSpotTypeSelect : Int = 1,//现货品种是否展开
+    @SerializedName("gplist")
     val gplist : List<Ermcp3GoodsGroupEx>? = arrayListOf(),//关联商品组列表 期货
+    @SerializedName("mg")
     val mg : ErmcpMiddleGoodsModel? = ErmcpMiddleGoodsModel(),
+    @SerializedName("dglist")
     val dglist : List<ErmcpDeliveryGoodsDetail>? = arrayListOf()//关联的现货品种列表 现货
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -48,10 +55,15 @@ data class MiddleGoodsDetail(
 
 //关联的现货品种列表
 data class ErmcpDeliveryGoodsDetail(
+    @SerializedName("data")
     val data : ErmcpDeliveryGoods? = ErmcpDeliveryGoods(),
+    @SerializedName("gblist")
     val gblist : List<Ermcp3Brand>? = arrayListOf(),
+    @SerializedName("isSpotSelect")
     var isSpotSelect : Int = 0,//品类是否展开
+    @SerializedName("convertratio")
     val convertratio : String? = "",//套保系数(折算系数)
+    @SerializedName("gmlist")
     val gmlist : List<Ermcp3Wrstandard>? = arrayListOf()
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/MiddleGoodsDetails.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 套保品种详情
@@ -10,7 +11,9 @@ import android.os.Parcelable
  * @constructor
  */
 data class MiddleGoodsDetails(
+    @SerializedName("middleGoodsData")
     val middleGoodsData: MiddleGoodsData = MiddleGoodsData(),
+    @SerializedName("cvList")
     val cvList : List<cvListData> = arrayListOf()
 )
 
@@ -24,10 +27,15 @@ data class MiddleGoodsDetails(
  * @constructor
  */
 data class cvListData(
+    @SerializedName("convertratio")
     val convertratio : String? = "",
+    @SerializedName("dstgoodsgroupid")
     val dstgoodsgroupid : String? = "",
+    @SerializedName("goodsgroupname")
     val goodsgroupname : String? = "",
+    @SerializedName("outergroupcode")
     val outergroupcode : String? = "",
+    @SerializedName("srcgoodsgroupid")
     val srcgoodsgroupid : String? = ""
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/NoticeData.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 通知公告
@@ -26,24 +27,24 @@ import android.os.Parcelable
  * @constructor
  */
 data class NoticeData(
-    val auditoruserid : String? = "",//审核人
-    val auditremark : String? = "",//审核备注
-    val audittime : String? = "",//审核日期
-    val autoid : String? = "",//自增ID
-    val content : String? = "",//内容
-    val createtime : String? = "",//创建时间
-    val creatorid : String? = "",//建仓人
-    val endtime : String? = "",//结束时间
-    val istop : String? = "",//是否置顶 - 0:不置顶 1:置顶
-    val msgiconurl : String? = "",//消息图标Url
-    val msgtype : String? = "",//消息类型 - 1:公告通知 2:系统消息 3:商品到期提货通知
-    val publisher : String? = "",//消息发布者
-    val readed : Boolean? = false,//是否已读
-    val scheduletime : String? = "",//计划发送时间
-    val sendtype : String? = "",//推送方式 - 1：全体广播 2：按会员广播 3：个人推送 4:按会员广播(仅会员)
-    val sentstatus : String? = "",//推送状态 - 0:未推送 1:已推送 2:审核拒绝
-    val title : String? = "",//标题
-    val userid : String? = ""//会员/投资者ID推送方式 为 个人时，填写投资者ID
+    @SerializedName("auditoruserid") val auditoruserid : String? = "",//审核人
+    @SerializedName("auditremark") val auditremark : String? = "",//审核备注
+    @SerializedName("audittime") val audittime : String? = "",//审核日期
+    @SerializedName("autoid") val autoid : String? = "",//自增ID
+    @SerializedName("content") val content : String? = "",//内容
+    @SerializedName("createtime") val createtime : String? = "",//创建时间
+    @SerializedName("creatorid") val creatorid : String? = "",//建仓人
+    @SerializedName("endtime") val endtime : String? = "",//结束时间
+    @SerializedName("istop") val istop : String? = "",//是否置顶 - 0:不置顶 1:置顶
+    @SerializedName("msgiconurl") val msgiconurl : String? = "",//消息图标Url
+    @SerializedName("msgtype") val msgtype : String? = "",//消息类型 - 1:公告通知 2:系统消息 3:商品到期提货通知
+    @SerializedName("publisher") val publisher : String? = "",//消息发布者
+    @SerializedName("readed") val readed : Boolean? = false,//是否已读
+    @SerializedName("scheduletime") val scheduletime : String? = "",//计划发送时间
+    @SerializedName("sendtype") val sendtype : String? = "",//推送方式 - 1：全体广播 2：按会员广播 3：个人推送 4:按会员广播(仅会员)
+    @SerializedName("sentstatus") val sentstatus : String? = "",//推送状态 - 0:未推送 1:已推送 2:审核拒绝
+    @SerializedName("title") val title : String? = "",//标题
+    @SerializedName("userid") val userid : String? = ""//会员/投资者ID推送方式 为 个人时，填写投资者ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),
@@ -102,4 +103,5 @@ data class NoticeData(
         }
     }
 
+
 }

RMA/app/src/main/java/cn/muchinfo/rma/global/data/NumberSpotData.kt

@@ -2,50 +2,51 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 敞口内的现货数量和期货数量的合并实体
  */
 data class NumberSpotData(
     //现货部分
-    val areauserid : String? = "",//所属机构
-    val decreaseqty : String? = "",//现货 减少数量=-(销售已定价数量+采购计划数量) / 期货 减少数量 = (期末卖头寸 - 期初卖头寸)*-1
-    val increaseqty : String? = "",//现货 增加数量=销售计划数量+采购已定价数量 / 期货 增加数量 = 期末买头寸 - 期初买头寸
-    val oritoalspotqty : String? = "",//昨日数量
-    val totalspotqty : String? = "",// 当前数量(现货头寸总量) = (销售计划数量 - 销售已定价数量) - (采购计划数量 - 采购已定价数量)
-    val updatetime : String? = "",//更新时间
-    val wrstandardcode : String? = "",//现货品种代码
-    val wrstandardid : String? = "",//现货商品ID
-    val wrstandardname : String? = "",//现货品种
+    @SerializedName("areauserid") val areauserid : String? = "",//所属机构
+    @SerializedName("decreaseqty") val decreaseqty : String? = "",//现货 减少数量=-(销售已定价数量+采购计划数量) / 期货 减少数量 = (期末卖头寸 - 期初卖头寸)*-1
+    @SerializedName("increaseqty") val increaseqty : String? = "",//现货 增加数量=销售计划数量+采购已定价数量 / 期货 增加数量 = 期末买头寸 - 期初买头寸
+    @SerializedName("oritoalspotqty") val oritoalspotqty : String? = "",//昨日数量
+    @SerializedName("totalspotqty") val totalspotqty : String? = "",// 当前数量(现货头寸总量) = (销售计划数量 - 销售已定价数量) - (采购计划数量 - 采购已定价数量)
+    @SerializedName("updatetime") val updatetime : String? = "",//更新时间
+    @SerializedName("wrstandardcode") val wrstandardcode : String? = "",//现货品种代码
+    @SerializedName("wrstandardid") val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("wrstandardname") val wrstandardname : String? = "",//现货品种
     //期货部分
-    val accountid : String? = "",//资金账号[外部母账户]
-    val curbuyposition : String? = "",//期末买头寸
-    val cursellposition : String? = "",//期末卖头寸
-    val curtdbuyposition : String? = "",//期末今日买头寸
-    val curtdsellposition : String? = "",//期末今日卖头寸
-    val curydbuyposition : String? = "",//期末上日买头寸
-    val curydsellposition : String? = "",//期末上日卖头寸
-    val fretdbuyposition : String? = "",//冻结今日买头寸
-    val fretdsellposition : String? = "",//冻结今日卖头寸
-    val freydbuyposition : String? = "",//冻结上日买头寸
-    val freydsellposition : String? = "",//冻结上日卖头寸
-    val goodscode : String? = "",//商品代码
-    val goodsid : String? = "",//商品id
-    val goodsname : String? = "",//商品名称
-    val hedgeaccountcode : String? = "",//对冲账号
-    val hedgegoodsid : String? = "",//对冲合约ID
-    val marketid : String? = "",//市场ID
-    val relateduserid : String? = "",//关联用户id
-    val totalcurqty : String? = "", //期货 当前数量(净头寸) = 期末买头寸 - 期末卖头寸
-    val totalydqty : String? = "",//期货 昨日数量(净头寸) = 期初买头寸 - 期初卖头寸
-    val tradedate : String? = "",//交易日(yyyyMMdd)
-    val ydbuyposition : String? = "",//期初买头寸
-    val ydsellposition : String? = "",//期初卖头寸
+    @SerializedName("accountid") val accountid : String? = "",//资金账号[外部母账户]
+    @SerializedName("curbuyposition") val curbuyposition : String? = "",//期末买头寸
+    @SerializedName("cursellposition") val cursellposition : String? = "",//期末卖头寸
+    @SerializedName("curtdbuyposition") val curtdbuyposition : String? = "",//期末今日买头寸
+    @SerializedName("curtdsellposition") val curtdsellposition : String? = "",//期末今日卖头寸
+    @SerializedName("curydbuyposition") val curydbuyposition : String? = "",//期末上日买头寸
+    @SerializedName("curydsellposition") val curydsellposition : String? = "",//期末上日卖头寸
+    @SerializedName("fretdbuyposition") val fretdbuyposition : String? = "",//冻结今日买头寸
+    @SerializedName("fretdsellposition") val fretdsellposition : String? = "",//冻结今日卖头寸
+    @SerializedName("freydbuyposition") val freydbuyposition : String? = "",//冻结上日买头寸
+    @SerializedName("freydsellposition") val freydsellposition : String? = "",//冻结上日卖头寸
+    @SerializedName("goodscode") val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid") val goodsid : String? = "",//商品id
+    @SerializedName("goodsname") val goodsname : String? = "",//商品名称
+    @SerializedName("hedgeaccountcode") val hedgeaccountcode : String? = "",//对冲账号
+    @SerializedName("hedgegoodsid") val hedgegoodsid : String? = "",//对冲合约ID
+    @SerializedName("marketid") val marketid : String? = "",//市场ID
+    @SerializedName("relateduserid") val relateduserid : String? = "",//关联用户id
+    @SerializedName("totalcurqty") val totalcurqty : String? = "", //期货 当前数量(净头寸) = 期末买头寸 - 期末卖头寸
+    @SerializedName("totalydqty") val totalydqty : String? = "",//期货 昨日数量(净头寸) = 期初买头寸 - 期初卖头寸
+    @SerializedName("tradedate") val tradedate : String? = "",//交易日(yyyyMMdd)
+    @SerializedName("ydbuyposition") val ydbuyposition : String? = "",//期初买头寸
+    @SerializedName("ydsellposition") val ydsellposition : String? = "",//期初卖头寸
     //------------三期-----------
-    val deliverygoodsname : String? = "",//现货品种名称
-    val deliverygoodsid : String? = "",//现货品种id
-    val enumdicname : String? = "",//单位
-    val deliverygoodscode : String? = ""//现货品种代码
+    @SerializedName("deliverygoodsname") val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("deliverygoodsid") val deliverygoodsid : String? = "",//现货品种id
+    @SerializedName("enumdicname") val enumdicname : String? = "",//单位
+    @SerializedName("deliverygoodscode") val deliverygoodscode : String? = ""//现货品种代码
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

RMA/app/src/main/java/cn/muchinfo/rma/global/data/NumberSpotDetailsData.kt

@@ -1,31 +1,33 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 现货头寸-现货明细列表数据/期货头寸-期货明细列表数据
  */
 data class NumberSpotDetailsData(
     //现货
-    val contracttype : String = "",//合同类型 1-采购 -1-销售
-    val createtime : String = "",//创建时间
-    val enumdicname : String = "",//现货商品单位名称
-    val logtype : String = "",//记录类型 1-套保计划 2-现货合同
-    val qty : String = "",//数量
-    val recordname : String = "",//类型名称
-    val relatedid : String = "",//套保计划ID/现货合同ID
-    val relatedno : String = "",//编号
-    val strtime : String = "",//时间
-    val wrstandardcode : String = "",//现货商品代码
-    val wrstandardname : String = "",//现货商品名称
+    @SerializedName("contracttype") val contracttype : String = "",//合同类型 1-采购 -1-销售
+    @SerializedName("createtime") val createtime : String = "",//创建时间
+    @SerializedName("enumdicname") val enumdicname : String = "",//现货商品单位名称
+    @SerializedName("logtype") val logtype : String = "",//记录类型 1-套保计划 2-现货合同
+    @SerializedName("qty") val qty : String = "",//数量
+    @SerializedName("recordname") val recordname : String = "",//类型名称
+    @SerializedName("relatedid") val relatedid : String = "",//套保计划ID/现货合同ID
+    @SerializedName("relatedno") val relatedno : String = "",//编号
+    @SerializedName("strtime") val strtime : String = "",//时间
+    @SerializedName("wrstandardcode") val wrstandardcode : String = "",//现货商品代码
+    @SerializedName("wrstandardname") val wrstandardname : String = "",//现货商品名称
     //期货
-    val buyorsell : String = "",//买卖方向 0-买 1-卖
-    val channelbuildtype : String = "",//开平方向 1-建仓 2-平仓
-    val goodscode : String = "",//商品代码
-    val goodsname : String = "",//商品名称
-    val hedgegoodsid : String = "",//商品id
-    val tradeqty : String = "",//数量(成交数量)
-    val tradetime : String = "",//时间(成交时间)
+    @SerializedName("buyorsell") val buyorsell : String = "",//买卖方向 0-买 1-卖
+    @SerializedName("channelbuildtype") val channelbuildtype : String = "",//开平方向 1-建仓 2-平仓
+    @SerializedName("goodscode") val goodscode : String = "",//商品代码
+    @SerializedName("goodsname") val goodsname : String = "",//商品名称
+    @SerializedName("hedgegoodsid") val hedgegoodsid : String = "",//商品id
+    @SerializedName("tradeqty") val tradeqty : String = "",//数量(成交数量)
+    @SerializedName("tradetime") val tradetime : String = "",//时间(成交时间)
 //------------三期-----------
-    val deliverygoodsname : String? = "",//现货品种名称
-    val deliverygoodsid : String? = "",//现货品种id
-    val deliverygoodscode : String? = ""//现货品种代码
+    @SerializedName("deliverygoodsname") val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("deliverygoodsid") val deliverygoodsid : String? = "",//现货品种id
+    @SerializedName("deliverygoodscode") val deliverygoodscode : String? = ""//现货品种代码
 )