From 0bdbfeb908ba6cc064854456eeb4961e2e29a316 Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 2 Feb 2024 14:33:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3=E5=87=BA?= =?UTF-8?q?=E5=8F=82=E6=80=BB=E6=9D=A1=E6=95=B0=E4=B8=BAtotal=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/commodity.go | 6 +++--- app/admin/models/user.go | 2 +- docs/docs.go | 32 ++++++++++++++++---------------- docs/swagger.json | 32 ++++++++++++++++---------------- docs/swagger.yaml | 24 ++++++++++++------------ 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/admin/models/commodity.go b/app/admin/models/commodity.go index 6885bf2..c140b28 100644 --- a/app/admin/models/commodity.go +++ b/app/admin/models/commodity.go @@ -286,7 +286,7 @@ type ErpCommodityListReq struct { } type ErpCommodityListResp struct { List []ErpCommodity `json:"list"` - Total int `json:"count"` // 数据总条数 + Total int `json:"total"` // 数据总条数 PageIndex int `json:"pageIndex"` // 页码 PageSize int `json:"pageSize"` // 每页展示条数 ExportUrl string `json:"export_url"` // 文件路径 @@ -1197,7 +1197,7 @@ type ErpStockListReq struct { type ErpStockListResp struct { List []ErpStock `json:"list"` - Total int `json:"count"` // 数据总条数 + Total int `json:"total"` // 数据总条数 PageIndex int `json:"pageIndex"` // 页码 PageSize int `json:"pageSize"` // 每页展示条数 ExportUrl string `json:"export_url"` @@ -1662,7 +1662,7 @@ type ErpStockCommodityListReq struct { // ErpStockCommodityListResp 库存详情接口响应参数 type ErpStockCommodityListResp struct { List []ErpStockCommodity `json:"list"` - Total int `json:"count"` // 数据总条数 + Total int `json:"total"` // 数据总条数 PageIndex int `json:"pageIndex"` // 页码 PageSize int `json:"pageSize"` // 每页展示条数 TotalWholesalePrice int `json:"total_wholesale_price"` // 入库采购价之和 diff --git a/app/admin/models/user.go b/app/admin/models/user.go index 4c133c0..e997a69 100644 --- a/app/admin/models/user.go +++ b/app/admin/models/user.go @@ -2580,7 +2580,7 @@ type AssistantInviteMemberReportReq struct { type AssistantInviteMemberReportListResp struct { List []InviteMemberReport `json:"list"` - Total int64 `json:"count"` // 数据总条数 + Total int64 `json:"total"` // 数据总条数 PageIndex int `json:"pageIndex"` // 页码 PageSize int `json:"pageSize"` // 每页展示条数 ExportUrl string `json:"export_url"` // 导出excel地址 diff --git a/docs/docs.go b/docs/docs.go index edbb15b..b63e012 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -4902,10 +4902,6 @@ const docTemplate = `{ "models.AssistantInviteMemberReportListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "description": "导出excel地址", "type": "string" @@ -4923,6 +4919,10 @@ const docTemplate = `{ "pageSize": { "description": "每页展示条数", "type": "integer" + }, + "total": { + "description": "数据总条数", + "type": "integer" } } }, @@ -5899,10 +5899,6 @@ const docTemplate = `{ "models.ErpCommodityListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "description": "文件路径", "type": "string" @@ -5920,6 +5916,10 @@ const docTemplate = `{ "pageSize": { "description": "每页展示条数", "type": "integer" + }, + "total": { + "description": "数据总条数", + "type": "integer" } } }, @@ -7119,10 +7119,6 @@ const docTemplate = `{ "models.ErpStockCommodityListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "type": "string" }, @@ -7140,6 +7136,10 @@ const docTemplate = `{ "description": "每页展示条数", "type": "integer" }, + "total": { + "description": "数据总条数", + "type": "integer" + }, "total_staff_price": { "description": "入库员工成本价之和", "type": "integer" @@ -7186,10 +7186,6 @@ const docTemplate = `{ "models.ErpStockListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "type": "string" }, @@ -7206,6 +7202,10 @@ const docTemplate = `{ "pageSize": { "description": "每页展示条数", "type": "integer" + }, + "total": { + "description": "数据总条数", + "type": "integer" } } }, diff --git a/docs/swagger.json b/docs/swagger.json index f914095..8641c54 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -4891,10 +4891,6 @@ "models.AssistantInviteMemberReportListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "description": "导出excel地址", "type": "string" @@ -4912,6 +4908,10 @@ "pageSize": { "description": "每页展示条数", "type": "integer" + }, + "total": { + "description": "数据总条数", + "type": "integer" } } }, @@ -5888,10 +5888,6 @@ "models.ErpCommodityListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "description": "文件路径", "type": "string" @@ -5909,6 +5905,10 @@ "pageSize": { "description": "每页展示条数", "type": "integer" + }, + "total": { + "description": "数据总条数", + "type": "integer" } } }, @@ -7108,10 +7108,6 @@ "models.ErpStockCommodityListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "type": "string" }, @@ -7129,6 +7125,10 @@ "description": "每页展示条数", "type": "integer" }, + "total": { + "description": "数据总条数", + "type": "integer" + }, "total_staff_price": { "description": "入库员工成本价之和", "type": "integer" @@ -7175,10 +7175,6 @@ "models.ErpStockListResp": { "type": "object", "properties": { - "count": { - "description": "数据总条数", - "type": "integer" - }, "export_url": { "type": "string" }, @@ -7195,6 +7191,10 @@ "pageSize": { "description": "每页展示条数", "type": "integer" + }, + "total": { + "description": "数据总条数", + "type": "integer" } } }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index a5ab4a0..815f8b3 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -419,9 +419,6 @@ definitions: type: object models.AssistantInviteMemberReportListResp: properties: - count: - description: 数据总条数 - type: integer export_url: description: 导出excel地址 type: string @@ -435,6 +432,9 @@ definitions: pageSize: description: 每页展示条数 type: integer + total: + description: 数据总条数 + type: integer type: object models.AssistantInviteMemberReportReq: properties: @@ -1142,9 +1142,6 @@ definitions: type: object models.ErpCommodityListResp: properties: - count: - description: 数据总条数 - type: integer export_url: description: 文件路径 type: string @@ -1158,6 +1155,9 @@ definitions: pageSize: description: 每页展示条数 type: integer + total: + description: 数据总条数 + type: integer type: object models.ErpOrder: properties: @@ -2033,9 +2033,6 @@ definitions: type: object models.ErpStockCommodityListResp: properties: - count: - description: 数据总条数 - type: integer export_url: type: string list: @@ -2048,6 +2045,9 @@ definitions: pageSize: description: 每页展示条数 type: integer + total: + description: 数据总条数 + type: integer total_staff_price: description: 入库员工成本价之和 type: integer @@ -2081,9 +2081,6 @@ definitions: type: object models.ErpStockListResp: properties: - count: - description: 数据总条数 - type: integer export_url: type: string list: @@ -2096,6 +2093,9 @@ definitions: pageSize: description: 每页展示条数 type: integer + total: + description: 数据总条数 + type: integer type: object models.GameCard: properties: