1.查询协议转让增加applyid,marketid字段

docs/docs.go

@@ -30497,6 +30497,10 @@ var doc = `{
         "models.TjmdTransferApply": {
             "type": "object",
             "properties": {
+                "applyid": {
+                    "description": "申请ID(自增ID　SEQ_TRADE_HOLDTRANSFERAPPLY)",
+                    "type": "integer"
+                },
                 "applystatus": {
                     "description": "状态 - 0:未提交 1:待审核 2:审核中 3:审核通过 4:审核拒绝 5:审核失败 6:已撤销",
                     "type": "integer"
@@ -30525,6 +30529,10 @@ var doc = `{
                     "description": "商品名称",
                     "type": "string"
                 },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
                 "qty": {
                     "description": "转让数量(数量)",
                     "type": "number"
@@ -32855,10 +32863,6 @@ var doc = `{
                     "description": "升贴水(浮动价时填写)    -   [挂牌]",
                     "type": "number"
                 },
-                "subnum": {
-                    "description": "提单子单号",
-                    "type": "integer"
-                },
                 "taname": {
                     "description": "交易用户名称(资金账号名称)",
                     "type": "string"

docs/swagger.json

@@ -30481,6 +30481,10 @@
         "models.TjmdTransferApply": {
             "type": "object",
             "properties": {
+                "applyid": {
+                    "description": "申请ID(自增ID　SEQ_TRADE_HOLDTRANSFERAPPLY)",
+                    "type": "integer"
+                },
                 "applystatus": {
                     "description": "状态 - 0:未提交 1:待审核 2:审核中 3:审核通过 4:审核拒绝 5:审核失败 6:已撤销",
                     "type": "integer"
@@ -30509,6 +30513,10 @@
                     "description": "商品名称",
                     "type": "string"
                 },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
                 "qty": {
                     "description": "转让数量(数量)",
                     "type": "number"
@@ -32839,10 +32847,6 @@
                     "description": "升贴水(浮动价时填写)    -   [挂牌]",
                     "type": "number"
                 },
-                "subnum": {
-                    "description": "提单子单号",
-                    "type": "integer"
-                },
                 "taname": {
                     "description": "交易用户名称(资金账号名称)",
                     "type": "string"

docs/swagger.yaml

@@ -12955,6 +12955,9 @@ definitions:
     type: object
   models.TjmdTransferApply:
     properties:
+      applyid:
+        description: 申请ID(自增ID　SEQ_TRADE_HOLDTRANSFERAPPLY)
+        type: integer
       applystatus:
         description: 状态 - 0:未提交 1:待审核 2:审核中 3:审核通过 4:审核拒绝 5:审核失败 6:已撤销
         type: integer
@@ -12976,6 +12979,9 @@ definitions:
       goodsname:
         description: 商品名称
         type: string
+      marketid:
+        description: 市场ID
+        type: integer
       qty:
         description: 转让数量(数量)
         type: number
@@ -14709,9 +14715,6 @@ definitions:
       pricemove:
         description: 升贴水(浮动价时填写)    -   [挂牌]
         type: number
-      subnum:
-        description: 提单子单号
-        type: integer
       taname:
         description: 交易用户名称(资金账号名称)
         type: string

models/tjmd.go

@@ -138,7 +138,8 @@ func (r *TjmdTradeOrderDetail) GetDataByPage() (interface{}, error, int, int, in
 
 // TjmdTransferApply 协议转让申请
 type TjmdTransferApply struct {
-	MARKETID        int32    `json:"-"  xorm:"MARKETID" form:"marketid"`         // 市场ID
+	APPLYID         int64    `json:"applyid"  xorm:"'APPLYID'"`                  // 申请ID(自增ID　SEQ_TRADE_HOLDTRANSFERAPPLY)
+	MARKETID        int32    `json:"marketid"  xorm:"MARKETID" form:"marketid"`  // 市场ID
 	INACCOUNTID     int64    `json:"-"  xorm:"INACCOUNTID" form:"inaccountid"`   // 转入方资金ID(确认方) --对方申请
 	OUTACCOUNTID    int64    `json:"-"  xorm:"OUTACCOUNTID" form:"outaccountid"` // 转出方资金ID(申请方) --我的申请
 	GOODSID         int32    `json:"goodsid"  xorm:"'GOODSID'"`                  // 商品ID
@@ -167,7 +168,9 @@ func (r *TjmdTransferApply) calc() {
 
 func (r *TjmdTransferApply) buildSql() string {
 	var sqlId utils.SQLVal = `
-select t.goodsid,
+select t.applyid,
+       t.marketid,
+       t.goodsid,
        g.goodscode,
        g.goodsname,
        g.qtydecimalplace,