/Mine/QueryMineTradeGoodsDeliveryOfflines: 返回添加 goodsunitid

docs/docs.go

@@ -24285,7 +24285,11 @@ const docTemplate = `{
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "$ref": "#/definitions/asign.APIFillData"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.APIFillData"
+                        }
+                    ]
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -24329,11 +24333,19 @@ const docTemplate = `{
             "properties": {
                 "company": {
                     "description": "企业法人银行卡四要素，实体类型为企业时必填",
-                    "$ref": "#/definitions/asign.CompanyBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.CompanyBankCard4"
+                        }
+                    ]
                 },
                 "person": {
                     "description": "个人银行卡四要素，实体类型为个人时必填",
-                    "$ref": "#/definitions/asign.PersonBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.PersonBankCard4"
+                        }
+                    ]
                 },
                 "type": {
                     "description": "实体类型 1:个人 2:企业",
@@ -24853,7 +24865,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -26255,7 +26271,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -26839,7 +26855,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -26879,7 +26895,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -27046,7 +27062,11 @@ const docTemplate = `{
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -27643,31 +27663,31 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "期初均价",
+                    "description": "套利变动量",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "期初均价",
+                    "description": "变动量(套保敞口)",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "期初均价",
+                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "期初均价",
+                    "description": "套保变动量",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "期初均价",
+                    "description": "变动量(总敞口) 平安:净敞口今日变动",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -29282,7 +29302,11 @@ const docTemplate = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -29617,7 +29641,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -31632,7 +31660,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -31644,7 +31672,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -31668,7 +31696,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -31700,7 +31728,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -31748,7 +31776,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -31768,7 +31796,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -34700,7 +34728,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -34724,11 +34752,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -34736,7 +34764,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -34760,31 +34788,31 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "期初均价",
+                    "description": "套保系数",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货)",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货-基价额)",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(现货)",
                     "type": "number"
                 },
                 "reckondate": {
@@ -34792,11 +34820,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -34804,39 +34832,39 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "期初均价",
+                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "期初均价",
+                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "期初均价",
+                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货)",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货-基价额)",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "期初均价",
+                    "description": "今日定价量(现货)",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "今日关联额(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(套保品-期货)",
                     "type": "number"
                 },
                 "updatetime": {
@@ -34848,7 +34876,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -35397,7 +35425,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -35465,7 +35493,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -35497,7 +35525,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -35505,7 +35533,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -35549,7 +35577,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -35565,7 +35593,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -37339,7 +37367,11 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37645,7 +37677,11 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39815,7 +39851,11 @@ const docTemplate = `{
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -44275,6 +44315,10 @@ const docTemplate = `{
                     "description": "单位",
                     "type": "string"
                 },
+                "goodsunitid": {
+                    "description": "单位ID",
+                    "type": "integer"
+                },
                 "marketIds": {
                     "description": "过滤市场ID列表，格式 1,2,3",
                     "type": "string"
@@ -53048,7 +53092,11 @@ const docTemplate = `{
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
@@ -55120,7 +55168,11 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -55254,7 +55306,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -55551,7 +55607,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56994,7 +57054,11 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -57026,7 +57090,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -57095,7 +57159,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -57570,7 +57634,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -57606,7 +57670,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -57630,7 +57694,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -59187,7 +59251,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -59195,7 +59259,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -59377,7 +59441,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -59635,7 +59699,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -59759,7 +59823,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -60647,7 +60711,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60958,7 +61022,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -61018,11 +61082,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -61058,7 +61122,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -61300,7 +61364,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -61721,7 +61785,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -62268,7 +62332,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -62405,11 +62469,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -62578,7 +62642,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -63170,7 +63234,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -66464,11 +66528,19 @@ const docTemplate = `{
             "properties": {
                 "organizationInfo": {
                     "description": "签署企业信息，用户类型为企业时必填",
-                    "$ref": "#/definitions/tencent.OrganizationInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.OrganizationInfo"
+                        }
+                    ]
                 },
                 "personInfo": {
                     "description": "签署人信息，用户类型为个人时必填",
-                    "$ref": "#/definitions/tencent.PersonInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.PersonInfo"
+                        }
+                    ]
                 },
                 "userESignRecordID": {
                     "description": "用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署",
@@ -66625,7 +66697,11 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -66643,11 +66719,19 @@ const docTemplate = `{
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "$ref": "#/definitions/models.Useraccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Useraccount"
+                        }
+                    ]
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "$ref": "#/definitions/models.Userinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Userinfo"
+                        }
+                    ]
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.json

@@ -24276,7 +24276,11 @@
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "$ref": "#/definitions/asign.APIFillData"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.APIFillData"
+                        }
+                    ]
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -24320,11 +24324,19 @@
             "properties": {
                 "company": {
                     "description": "企业法人银行卡四要素，实体类型为企业时必填",
-                    "$ref": "#/definitions/asign.CompanyBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.CompanyBankCard4"
+                        }
+                    ]
                 },
                 "person": {
                     "description": "个人银行卡四要素，实体类型为个人时必填",
-                    "$ref": "#/definitions/asign.PersonBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.PersonBankCard4"
+                        }
+                    ]
                 },
                 "type": {
                     "description": "实体类型 1:个人 2:企业",
@@ -24844,7 +24856,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -26246,7 +26262,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -26830,7 +26846,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -26870,7 +26886,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -27037,7 +27053,11 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -27634,31 +27654,31 @@
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "期初均价",
+                    "description": "套利变动量",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "期初均价",
+                    "description": "变动量(套保敞口)",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "期初均价",
+                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "期初均价",
+                    "description": "套保变动量",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "期初均价",
+                    "description": "变动量(总敞口) 平安:净敞口今日变动",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -29273,7 +29293,11 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -29608,7 +29632,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -31623,7 +31651,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -31635,7 +31663,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -31659,7 +31687,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -31691,7 +31719,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -31739,7 +31767,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -31759,7 +31787,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -34691,7 +34719,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -34715,11 +34743,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -34727,7 +34755,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -34751,31 +34779,31 @@
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "期初均价",
+                    "description": "套保系数",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货)",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货-基价额)",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(现货)",
                     "type": "number"
                 },
                 "reckondate": {
@@ -34783,11 +34811,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -34795,39 +34823,39 @@
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "期初均价",
+                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "期初均价",
+                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "期初均价",
+                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货)",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货-基价额)",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "期初均价",
+                    "description": "今日定价量(现货)",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "今日关联额(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(套保品-期货)",
                     "type": "number"
                 },
                 "updatetime": {
@@ -34839,7 +34867,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -35388,7 +35416,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -35456,7 +35484,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -35488,7 +35516,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -35496,7 +35524,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -35540,7 +35568,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -35556,7 +35584,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -37330,7 +37358,11 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37636,7 +37668,11 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39806,7 +39842,11 @@
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -44266,6 +44306,10 @@
                     "description": "单位",
                     "type": "string"
                 },
+                "goodsunitid": {
+                    "description": "单位ID",
+                    "type": "integer"
+                },
                 "marketIds": {
                     "description": "过滤市场ID列表，格式 1,2,3",
                     "type": "string"
@@ -53039,7 +53083,11 @@
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
@@ -55111,7 +55159,11 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -55245,7 +55297,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -55542,7 +55598,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56985,7 +57045,11 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -57017,7 +57081,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -57086,7 +57150,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -57561,7 +57625,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -57597,7 +57661,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -57621,7 +57685,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -59178,7 +59242,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -59186,7 +59250,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -59368,7 +59432,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -59626,7 +59690,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -59750,7 +59814,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -60638,7 +60702,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60949,7 +61013,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -61009,11 +61073,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -61049,7 +61113,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -61291,7 +61355,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -61712,7 +61776,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -62259,7 +62323,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -62396,11 +62460,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -62569,7 +62633,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -63161,7 +63225,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -66455,11 +66519,19 @@
             "properties": {
                 "organizationInfo": {
                     "description": "签署企业信息，用户类型为企业时必填",
-                    "$ref": "#/definitions/tencent.OrganizationInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.OrganizationInfo"
+                        }
+                    ]
                 },
                 "personInfo": {
                     "description": "签署人信息，用户类型为个人时必填",
-                    "$ref": "#/definitions/tencent.PersonInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.PersonInfo"
+                        }
+                    ]
                 },
                 "userESignRecordID": {
                     "description": "用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署",
@@ -66616,7 +66688,11 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -66634,11 +66710,19 @@
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "$ref": "#/definitions/models.Useraccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Useraccount"
+                        }
+                    ]
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "$ref": "#/definitions/models.Userinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Userinfo"
+                        }
+                    ]
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.yaml

@@ -333,7 +333,8 @@ definitions:
         description: 合同编号（此处可传已完成签署的合同编号，实现追加签章的场景）
         type: string
       fillData:
-        $ref: '#/definitions/asign.APIFillData'
+        allOf:
+        - $ref: '#/definitions/asign.APIFillData'
         description: 单行文本、多行文本、日期、身份证类型参数填充。
       tableDatas:
         description: 表格填充数据
@@ -363,10 +364,12 @@ definitions:
   asign.BankCard4Req:
     properties:
       company:
-        $ref: '#/definitions/asign.CompanyBankCard4'
+        allOf:
+        - $ref: '#/definitions/asign.CompanyBankCard4'
         description: 企业法人银行卡四要素，实体类型为企业时必填
       person:
-        $ref: '#/definitions/asign.PersonBankCard4'
+        allOf:
+        - $ref: '#/definitions/asign.PersonBankCard4'
         description: 个人银行卡四要素，实体类型为个人时必填
       type:
         description: 实体类型 1:个人 2:企业
@@ -744,7 +747,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1792,7 +1796,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 期初均价
+        description: 点价金额=(点价价格+升贴水)*点价数量
         type: number
       applyid:
         description: 申请人
@@ -2227,7 +2231,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 期初均价
+        description: 退款(非必填)
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -2257,7 +2261,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 期初均价
+        description: 收付款(非必填)
         type: number
       pricemove:
         description: 升贴水
@@ -2379,7 +2383,8 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2824,25 +2829,25 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 期初均价
+        description: 套利变动量
         type: number
       diffExposoureQty:
-        description: 期初均价
+        description: 变动量(套保敞口)
         type: number
       diffFutuQty:
-        description: 期初均价
+        description: 变动量(期货总量) 平安：保值净持仓量今日变动
         type: number
       diffHedgeQty:
-        description: 期初均价
+        description: 套保变动量
         type: number
       diffQty:
-        description: 期初均价
+        description: 变动量(总敞口) 平安:净敞口今日变动
         type: number
       diffSpotHedgeQty:
-        description: 期初均价
+        description: 变动量(现货应套保总量) 平安:应套保量今日变动
         type: number
       diffSpotQty:
-        description: 期初均价
+        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动
         type: number
       enumdicname:
         description: 单位名称
@@ -4044,7 +4049,8 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        $ref: '#/definitions/erms3.CustomerInfo'
+        allOf:
+        - $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -4289,7 +4295,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -5782,7 +5789,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期初均价
+        description: 期末均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -5791,7 +5798,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -5809,7 +5816,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -5833,7 +5840,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -5869,7 +5876,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -5884,7 +5891,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8064,7 +8071,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8082,16 +8089,16 @@ definitions:
         description: 品种名称
         type: string
       diffprice:
-        description: 期初均价
+        description: 现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价
         type: number
       diffqty:
-        description: 期初均价
+        description: 期现数量差 = 套保计划量 - 今日期货关联成交量
         type: number
       enddate:
         description: 结束交易日
         type: string
       hedgeplanqty:
-        description: 期初均价
+        description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
         type: number
       matchname:
         description: 交易对手方(个人:用户名称 企业:简称)
@@ -8109,64 +8116,64 @@ definitions:
         description: 套保品种名称
         type: string
       middlegoodspricedqty:
-        description: 期初均价
+        description: 已定价量(套保品种 - 税前) = PricedQty * 折算系数
         type: number
       middlegoodspricedqty2:
-        description: 期初均价
+        description: 已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))
         type: number
       middlegoodspricedqty3:
-        description: 期初均价
+        description: 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
         type: number
       needhedgeratio:
-        description: 期初均价
+        description: 套保系数
         type: number
       pricedamount:
-        description: 期初均价
+        description: 已定价额(现货)
         type: number
       pricedamount2:
-        description: 期初均价
+        description: 已定价额(现货-基价额)
         type: number
       pricedqty:
-        description: 期初均价
+        description: 已定价量(现货)
         type: number
       reckondate:
         description: 日照时期(yyyyMMdd)
         type: string
       relatedmiddlegoodsamount:
-        description: 期初均价
+        description: 已关联额(期货)
         type: number
       relatedmiddlegoodsqty:
-        description: 期初均价
+        description: 已关联量(套保品种)(期货)
         type: number
       spotcontractid:
         description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
         type: string
       todayavgfutuprice:
-        description: 期初均价
+        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
         type: number
       todayavgprice:
-        description: 期初均价
+        description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
         type: number
       todayavgprice2:
-        description: 期初均价
+        description: 今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty
         type: number
       todaypricedamount:
-        description: 期初均价
+        description: 今日定价额(现货)
         type: number
       todaypricedamount2:
-        description: 期初均价
+        description: 今日定价额(现货-基价额)
         type: number
       todaypricedqty:
-        description: 期初均价
+        description: 今日定价量(现货)
         type: number
       todayrelatedfutureqty:
-        description: 期初均价
+        description: 今日关联量(期货)
         type: number
       todayrelatedmiddlegoodsamount:
-        description: 期初均价
+        description: 今日关联额(期货)
         type: number
       todayrelatedmiddlegoodsqty:
-        description: 期初均价
+        description: 今日关联量(套保品-期货)
         type: number
       updatetime:
         description: 更新时间
@@ -8175,7 +8182,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8583,7 +8590,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8634,7 +8641,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8658,13 +8665,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8697,7 +8704,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8709,7 +8716,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -10023,7 +10030,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10250,7 +10258,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -11851,7 +11860,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -15204,6 +15214,9 @@ definitions:
       goodsunit:
         description: 单位
         type: string
+      goodsunitid:
+        description: 单位ID
+        type: integer
       marketIds:
         description: 过滤市场ID列表，格式 1,2,3
         type: string
@@ -21705,7 +21718,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -23237,7 +23251,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23394,7 +23409,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23573,7 +23589,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24623,7 +24640,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -24647,7 +24665,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -24698,7 +24716,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -25051,7 +25069,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -25078,7 +25096,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -25096,7 +25114,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -26257,13 +26275,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -26398,7 +26416,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -26586,7 +26604,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -26679,7 +26697,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -27338,7 +27356,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -27573,7 +27591,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -27618,10 +27636,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -27648,7 +27666,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -27829,7 +27847,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -28147,7 +28165,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -28559,7 +28577,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -28661,10 +28679,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -28791,7 +28809,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -29227,7 +29245,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -31718,10 +31736,12 @@ definitions:
   tencent.CreateFlowByTemplateDirectlyReq:
     properties:
       organizationInfo:
-        $ref: '#/definitions/tencent.OrganizationInfo'
+        allOf:
+        - $ref: '#/definitions/tencent.OrganizationInfo'
         description: 签署企业信息，用户类型为企业时必填
       personInfo:
-        $ref: '#/definitions/tencent.PersonInfo'
+        allOf:
+        - $ref: '#/definitions/tencent.PersonInfo'
         description: 签署人信息，用户类型为个人时必填
       userESignRecordID:
         description: 用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署
@@ -31836,7 +31856,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -31849,10 +31870,12 @@ definitions:
           $ref: '#/definitions/models.Systemparam'
         type: array
       userAccount:
-        $ref: '#/definitions/models.Useraccount'
+        allOf:
+        - $ref: '#/definitions/models.Useraccount'
         description: 用户账号
       userInfo:
-        $ref: '#/definitions/models.Userinfo'
+        allOf:
+        - $ref: '#/definitions/models.Userinfo'
         description: 用户信息
       username:
         description: 用户姓名

models/mine.go

@@ -995,6 +995,7 @@ type MineTradeGoodsDeliveryOffline struct {
 	GOODSNAMETH  string  `json:"goodsnameth" xorm:"GOODSNAMETH"`     // 期货合约名称泰文)
 	GOODSNAMEEN  string  `json:"goodsnameen" xorm:"GOODSNAMEEN"`     // 期货合约名称(英文)
 	GOODSNAMETW  string  `json:"goodsnametw" xorm:"GOODSNAMETW"`     // 期货合约名称(繁体)
+	GOODSUNITID  int32   `json:"goodsunitid" xorm:"GOODSUNITID"`     // 单位ID
 
 	MarketIds string `form:"marketids"` // 过滤市场ID列表，格式 1,2,3
 
@@ -1041,7 +1042,8 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
 	   t.totalotherfee,
 	   ge.goodsnameth,
 	   ge.goodsnameen,
-	   ge.goodsnametw
+	   ge.goodsnametw,
+	   g.goodunitid GOODSUNITID
 	   
   from Trade_GoodsDeliveryOffLine t