From 8fcc8d68d295ed80a42c4862f0591cd187df38b7 Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期三, 19 六月 2024 14:26:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian
---
docs/docs.go | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3556fb5..56ac84f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1861,6 +1861,7 @@
"parameters": [
{
"type": "string",
+ "description": "鍏抽敭瀛楁悳绱�",
"name": "keyword",
"in": "query"
},
@@ -1874,6 +1875,12 @@
"type": "integer",
"description": "姣忛〉澶у皬",
"name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "浠撳簱id",
+ "name": "warehouseId",
"in": "query"
}
],
@@ -3445,6 +3452,18 @@
"ReservationNever"
]
},
+ "gorm.DeletedAt": {
+ "type": "object",
+ "properties": {
+ "time": {
+ "type": "string"
+ },
+ "valid": {
+ "description": "Valid is true if Time is not NULL",
+ "type": "boolean"
+ }
+ }
+ },
"inventory_order.WorkerInfo": {
"type": "object",
"properties": {
@@ -3473,6 +3492,46 @@
},
"id": {
"type": "integer"
+ }
+ }
+ },
+ "models.Attribute": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "dataType": {
+ "description": "鍊肩被鍨嬶紙1瀛楃涓� 2 int 3 涓嬫媺妗� 锛�",
+ "type": "integer"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "entityType": {
+ "description": "缁欒皝鐢ㄧ殑 1 鐗╂枡锛堜骇鍝侊級",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "灞炴�у悕绉�",
+ "type": "string"
+ },
+ "selectValues": {
+ "description": "dateType=3鏃剁敤",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "value": {
+ "description": "浠嶢ttributeValue鍙栧埌鐨剉alue",
+ "type": "string"
}
}
},
@@ -3712,6 +3771,13 @@
"type": "array",
"items": {
"$ref": "#/definitions/models.Attachment"
+ }
+ },
+ "attributes": {
+ "description": "鍔ㄦ�佸睘鎬�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Attribute"
}
},
"autoIncr": {
@@ -4325,6 +4391,9 @@
},
"id": {
"type": "integer"
+ },
+ "note": {
+ "type": "string"
},
"operationId": {
"description": "鎿嶄綔id",
@@ -5186,6 +5255,14 @@
"condition": {
"type": "string"
},
+ "keyword": {
+ "description": "鍏抽敭瀛楁悳绱�",
+ "type": "string"
+ },
+ "locationId": {
+ "description": "浣嶇疆ID",
+ "type": "integer"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -5193,6 +5270,10 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
}
}
},
--
Gitblit v1.8.0