From f264456b1e4fd284f53ecc4c70a3b951578bfd2d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 docs/docs.go |  920 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 836 insertions(+), 84 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 414e949..aa37bdd 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -664,6 +664,36 @@
                 }
             }
         },
+        "/api/client/checkName": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Client"
+                ],
+                "summary": "妫�鏌ュ鎴峰悕绉版槸鍚﹂噸澶�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.CheckClientName"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/client/delete": {
             "delete": {
                 "produces": [
@@ -1495,6 +1525,37 @@
                 }
             }
         },
+        "/api/contactInformation/list": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "ContactInformation"
+                ],
+                "summary": "鑱旂郴鏂瑰紡鍒楄〃",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/contextx.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/response.ContactInformationResponse"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/api/contract/add": {
             "post": {
                 "produces": [
@@ -1525,7 +1586,7 @@
                 }
             }
         },
-        "/api/contract/delete/{id}": {
+        "/api/contract/delete": {
             "delete": {
                 "produces": [
                     "application/json"
@@ -1536,11 +1597,13 @@
                 "summary": "鍒犻櫎鍚堝悓",
                 "parameters": [
                     {
-                        "type": "integer",
                         "description": "鏌ヨ鍙傛暟",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.DeleteContract"
+                        }
                     }
                 ],
                 "responses": {
@@ -3947,7 +4010,7 @@
                 }
             }
         },
-        "/api/masterOrder/delete/{id}": {
+        "/api/masterOrder/delete": {
             "delete": {
                 "produces": [
                     "application/json"
@@ -3958,11 +4021,13 @@
                 "summary": "鍒犻櫎涓昏鍗�",
                 "parameters": [
                     {
-                        "type": "integer",
                         "description": "鏌ヨ鍙傛暟",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.DeleteMasterOrder"
+                        }
                     }
                 ],
                 "responses": {
@@ -5165,7 +5230,7 @@
                 }
             }
         },
-        "/api/quotation/delete/{id}": {
+        "/api/quotation/delete": {
             "delete": {
                 "produces": [
                     "application/json"
@@ -5176,11 +5241,13 @@
                 "summary": "鍒犻櫎鎶ヤ环鍗�",
                 "parameters": [
                     {
-                        "type": "integer",
                         "description": "鏌ヨ鍙傛暟",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.DeleteQuotation"
+                        }
                     }
                 ],
                 "responses": {
@@ -6318,7 +6385,7 @@
                 }
             }
         },
-        "/api/saleChance/delete/{id}": {
+        "/api/saleChance/delete": {
             "delete": {
                 "produces": [
                     "application/json"
@@ -6329,11 +6396,13 @@
                 "summary": "鍒犻櫎閿�鍞満浼�",
                 "parameters": [
                     {
-                        "type": "integer",
                         "description": "鏌ヨ鍙傛暟",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.DeleteSaleChance"
+                        }
                     }
                 ],
                 "responses": {
@@ -6716,6 +6785,36 @@
                 }
             }
         },
+        "/api/salesDetails/delete": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "SalesDetails 閿�鍞槑缁�"
+                ],
+                "summary": "鎵归噺鍒犻櫎閿�鍞槑缁�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.CommonIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/salesDetails/delete/{id}": {
             "delete": {
                 "produces": [
@@ -6984,7 +7083,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "SalesRefund"
+                    "閿�鍞��娆惧崟"
                 ],
                 "summary": "娣诲姞閿�鍞��娆�",
                 "parameters": [
@@ -7008,13 +7107,43 @@
                 }
             }
         },
+        "/api/salesRefund/delete": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "閿�鍞��娆惧崟"
+                ],
+                "summary": "鎵归噺鍒犻櫎閿�鍞��娆惧崟",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.CommonIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/salesRefund/delete/{id}": {
             "delete": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "SalesRefund"
+                    "閿�鍞��娆惧崟"
                 ],
                 "summary": "鍒犻櫎閿�鍞��娆�",
                 "parameters": [
@@ -7042,7 +7171,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "SalesRefund"
+                    "閿�鍞��娆惧崟"
                 ],
                 "summary": "閿�鍞��娆惧崟鍒楄〃",
                 "parameters": [
@@ -7084,7 +7213,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "SalesRefund"
+                    "閿�鍞��娆惧崟"
                 ],
                 "summary": "鏇存柊閿�鍞��娆�",
                 "parameters": [
@@ -7114,7 +7243,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "SalesReturn"
+                    "閿�鍞��璐у崟"
                 ],
                 "summary": "娣诲姞閿�鍞��璐�",
                 "parameters": [
@@ -7138,13 +7267,43 @@
                 }
             }
         },
+        "/api/salesReturn/delete": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "閿�鍞��璐у崟"
+                ],
+                "summary": "鎵归噺鍒犻櫎閿�鍞��璐у崟",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.CommonIds"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api/salesReturn/delete/{id}": {
             "delete": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "SalesReturn"
+                    "閿�鍞��璐у崟"
                 ],
                 "summary": "鍒犻櫎閿�鍞��璐�",
                 "parameters": [
@@ -7172,7 +7331,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "SalesReturn"
+                    "閿�鍞��璐у崟"
                 ],
                 "summary": "閿�鍞��璐у崟鍒楄〃",
                 "parameters": [
@@ -7214,7 +7373,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "SalesReturn"
+                    "閿�鍞��璐у崟"
                 ],
                 "summary": "鏇存柊閿�鍞��璐�",
                 "parameters": [
@@ -7763,15 +7922,15 @@
                 "tags": [
                     "ServiceContract"
                 ],
-                "summary": "鍒犻櫎鏈嶅姟鍚堝悓",
+                "summary": "鎵归噺鍒犻櫎鏈嶅姟鍚堝悓",
                 "parameters": [
                     {
-                        "description": "鏌ヨ鍙傛暟",
+                        "description": "鍙傛暟",
                         "name": "object",
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/request.DeleteServiceContract"
+                            "$ref": "#/definitions/request.CommonIds"
                         }
                     }
                 ],
@@ -8376,6 +8535,36 @@
                         "required": true,
                         "schema": {
                             "$ref": "#/definitions/request.AddServiceOrder"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/serviceOrder/delete": {
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鏈嶅姟鍗�"
+                ],
+                "summary": "鎵归噺鍒犻櫎鏈嶅姟鍗�",
+                "parameters": [
+                    {
+                        "description": "鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.CommonIds"
                         }
                     }
                 ],
@@ -9155,7 +9344,7 @@
                 }
             }
         },
-        "/api/subOrder/delete/{id}": {
+        "/api/subOrder/delete": {
             "delete": {
                 "produces": [
                     "application/json"
@@ -9166,11 +9355,13 @@
                 "summary": "鍒犻櫎瀛愯鍗�",
                 "parameters": [
                     {
-                        "type": "integer",
                         "description": "鏌ヨ鍙傛暟",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.DeleteSubOrder"
+                        }
                     }
                 ],
                 "responses": {
@@ -9992,18 +10183,36 @@
                 "BankAccountQueryClassExpireLessThen60Days"
             ]
         },
-        "constvar.CollectionStatus": {
+        "constvar.CollectionSourceType": {
             "type": "integer",
             "enum": [
                 1,
                 2
             ],
             "x-enum-comments": {
+                "CollectionSourceTypeSaleDetails": "閿�鍞槑缁�",
+                "CollectionSourceTypeServiceContract": "鏈嶅姟鍚堝悓"
+            },
+            "x-enum-varnames": [
+                "CollectionSourceTypeSaleDetails",
+                "CollectionSourceTypeServiceContract"
+            ]
+        },
+        "constvar.CollectionStatus": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3
+            ],
+            "x-enum-comments": {
                 "CollectionStatusCollected": "宸叉敹娆�",
+                "CollectionStatusSubCollected": "閮ㄥ垎鏀舵",
                 "CollectionStatusUnCollected": "寰呮敹娆�"
             },
             "x-enum-varnames": [
                 "CollectionStatusUnCollected",
+                "CollectionStatusSubCollected",
                 "CollectionStatusCollected"
             ]
         },
@@ -10144,6 +10353,35 @@
                 "ReceiptQueryClassExpireLessThen60Days"
             ]
         },
+        "constvar.ReceiptSourceType": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3,
+                4,
+                5
+            ],
+            "x-enum-varnames": [
+                "ReceiptSourceTypeSalesDetails",
+                "ReceiptSourceTypeServiceContract",
+                "ReceiptSourceTypeInvoice",
+                "ReceiptSourceTypeCollectionPlan",
+                "ReceiptSourceTypeChuKuDan"
+            ]
+        },
+        "constvar.RefundSourceType": {
+            "type": "integer",
+            "enum": [
+                1
+            ],
+            "x-enum-comments": {
+                "RefundSourceTypeSalesReturn": "閿�鍞��璐�"
+            },
+            "x-enum-varnames": [
+                "RefundSourceTypeSalesReturn"
+            ]
+        },
         "constvar.SalesDetailsKeywordType": {
             "type": "string",
             "enum": [
@@ -10159,6 +10397,66 @@
                 "SalesDetailsKeywordTypeSignTime",
                 "SalesDetailsKeywordTypePrincipal",
                 "SalesDetailsKeywordTypeProductName"
+            ]
+        },
+        "constvar.SalesRefundKeywordType": {
+            "type": "string",
+            "enum": [
+                "閿�鍞��璐у崟缂栧彿",
+                "瀹㈡埛鍚嶇О",
+                "閫�娆炬棩鏈�",
+                "璐︽埛",
+                "鏄惁寮�绁�",
+                "浠樻鏂瑰紡",
+                "閿�鍞礋璐d汉",
+                "淇敼鏃堕棿",
+                "浠风◣鍚堣"
+            ],
+            "x-enum-varnames": [
+                "SalesRefundKeywordRefundNumber",
+                "SalesRefundKeywordClientName",
+                "SalesRefundKeywordRefundDate",
+                "SalesRefundKeywordAccount",
+                "SalesRefundKeywordIsInvoice",
+                "SalesRefundKeywordPaymentType",
+                "SalesRefundKeywordPrincipal",
+                "SalesRefundKeywordUpdateAt",
+                "SalesRefundKeywordPriceTotal"
+            ]
+        },
+        "constvar.SalesReturnKeywordType": {
+            "type": "string",
+            "enum": [
+                "閿�鍞��璐у崟缂栧彿",
+                "瀹㈡埛鍚嶇О",
+                "閫�娆炬棩鏈�",
+                "鐘舵��",
+                "閫�鍏ヤ粨搴�",
+                "搴旈��娆�",
+                "宸查��娆�",
+                "閿�鍞礋璐d汉"
+            ],
+            "x-enum-varnames": [
+                "SalesReturnKeywordReturnNumber",
+                "SalesReturnKeywordClientName",
+                "SalesReturnKeywordReturnDate",
+                "SalesReturnKeywordStatus",
+                "SalesReturnKeywordRepository",
+                "SalesReturnKeywordAmountShouldRefund",
+                "SalesReturnKeywordAmountHasRefund",
+                "SalesReturnKeywordPrincipal"
+            ]
+        },
+        "constvar.SalesReturnSourceType": {
+            "type": "integer",
+            "enum": [
+                1
+            ],
+            "x-enum-comments": {
+                "SalesReturnSourceTypeSaleDetails": "閿�鍞槑缁�"
+            },
+            "x-enum-varnames": [
+                "SalesReturnSourceTypeSaleDetails"
             ]
         },
         "constvar.SalesStatus": {
@@ -10453,6 +10751,10 @@
         "model.Client": {
             "type": "object",
             "properties": {
+                "_": {
+                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
+                },
                 "business_scope": {
                     "type": "string"
                 },
@@ -10498,6 +10800,13 @@
                 "country_id": {
                     "type": "integer"
                 },
+                "created_at": {
+                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
+                },
+                "creator_id": {
+                    "type": "integer"
+                },
                 "detail_address": {
                     "type": "string"
                 },
@@ -10520,6 +10829,7 @@
                     }
                 },
                 "id": {
+                    "description": "The ID of the item\nexample: 1",
                     "type": "integer"
                 },
                 "industry": {
@@ -10575,6 +10885,10 @@
                 },
                 "service_member_id": {
                     "type": "integer"
+                },
+                "updated_at": {
+                    "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
                 }
             }
         },
@@ -10625,16 +10939,16 @@
         "model.CollectionProjection": {
             "type": "object",
             "properties": {
+                "_": {
+                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
+                },
                 "created_at": {
                     "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                     "type": "string"
                 },
                 "creator": {
                     "type": "integer"
-                },
-                "deleted_at": {
-                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
-                    "type": "string"
                 },
                 "estimated_collection_amount": {
                     "type": "number"
@@ -10690,6 +11004,9 @@
                 },
                 "is_first": {
                     "type": "boolean"
+                },
+                "member": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "member_id": {
                     "type": "integer"
@@ -10765,6 +11082,9 @@
                 "is_first": {
                     "type": "boolean"
                 },
+                "member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "member_id": {
                     "type": "integer"
                 },
@@ -10797,17 +11117,43 @@
                 }
             }
         },
+        "model.ContactInformation": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "model.Contract": {
             "type": "object",
             "properties": {
+                "_": {
+                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
+                },
                 "clientId": {
                     "type": "integer"
+                },
+                "created_at": {
+                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
                 },
                 "file": {
                     "type": "string"
                 },
                 "id": {
+                    "description": "The ID of the item\nexample: 1",
                     "type": "integer"
+                },
+                "member": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "memberId": {
                     "type": "integer"
@@ -10823,6 +11169,10 @@
                 },
                 "statusId": {
                     "type": "integer"
+                },
+                "updated_at": {
+                    "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
+                    "type": "string"
                 }
             }
         },
@@ -10929,6 +11279,9 @@
                 "client_id": {
                     "type": "integer"
                 },
+                "client_status": {
+                    "$ref": "#/definitions/model.ClientStatus"
+                },
                 "client_status_id": {
                     "type": "integer"
                 },
@@ -10968,8 +11321,14 @@
                 "record": {
                     "type": "string"
                 },
+                "sale_chance": {
+                    "$ref": "#/definitions/model.SaleChance"
+                },
                 "sale_chance_id": {
                     "type": "integer"
+                },
+                "sales_leads": {
+                    "$ref": "#/definitions/model.SalesLeads"
                 },
                 "sales_leads_id": {
                     "type": "integer"
@@ -11126,6 +11485,9 @@
                 },
                 "id": {
                     "type": "integer"
+                },
+                "member": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "member_id": {
                     "type": "integer"
@@ -11358,6 +11720,9 @@
                 "id": {
                     "type": "integer"
                 },
+                "member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "member_id": {
                     "type": "integer"
                 },
@@ -11369,6 +11734,9 @@
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
+                },
+                "quotation_status": {
+                    "$ref": "#/definitions/model.QuotationStatus"
                 },
                 "quotation_status_id": {
                     "type": "integer"
@@ -11398,6 +11766,13 @@
         "model.Receipt": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "鏀舵閲戦",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
                 "bankAccountId": {
                     "description": "璐︽埛id",
                     "type": "integer"
@@ -11417,9 +11792,20 @@
                     "description": "甯佺",
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
                 "paymentTypeId": {
                     "description": "鏀舵鏂瑰紡ID",
                     "type": "integer"
+                },
+                "principal": {
+                    "description": "璐熻矗浜篿d",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "principalId": {
                     "description": "璐熻矗浜篿d",
@@ -11439,7 +11825,11 @@
                 },
                 "sourceType": {
                     "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.ReceiptSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -11575,6 +11965,9 @@
                 "key_maker": {
                     "type": "string"
                 },
+                "member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "member_id": {
                     "type": "integer"
                 },
@@ -11592,6 +11985,9 @@
                 },
                 "possibilities_id": {
                     "type": "integer"
+                },
+                "possibility": {
+                    "$ref": "#/definitions/model.Possibility"
                 },
                 "process": {
                     "type": "string"
@@ -11611,19 +12007,28 @@
                 "region_id": {
                     "type": "integer"
                 },
+                "regular_customers": {
+                    "$ref": "#/definitions/model.RegularCustomers"
+                },
                 "regular_customers_id": {
                     "type": "integer"
                 },
                 "remark": {
                     "type": "string"
                 },
+                "sale_stage": {
+                    "$ref": "#/definitions/model.SaleStage"
+                },
                 "sale_stage_id": {
                     "type": "integer"
+                },
+                "sale_type": {
+                    "$ref": "#/definitions/model.SaleType"
                 },
                 "sale_type_id": {
                     "type": "integer"
                 },
-                "salesSources": {
+                "sales_sources": {
                     "$ref": "#/definitions/model.SalesSources"
                 },
                 "sales_sources_id": {
@@ -11668,6 +12073,9 @@
         "model.SalesDetails": {
             "type": "object",
             "properties": {
+                "Member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "address": {
                     "type": "string"
                 },
@@ -11686,6 +12094,10 @@
                     "description": "宸叉敹閲戦",
                     "type": "number"
                 },
+                "amountTotal": {
+                    "description": "浠风◣鍚堣",
+                    "type": "number"
+                },
                 "amountUnInvoiced": {
                     "description": "鏈紑绁ㄩ噾棰�",
                     "type": "number"
@@ -11697,6 +12109,15 @@
                     "type": "integer"
                 },
                 "conditions": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorId": {
+                    "type": "integer"
+                },
+                "creatorName": {
                     "type": "string"
                 },
                 "deliveryDate": {
@@ -11788,6 +12209,9 @@
                 "id": {
                     "type": "integer"
                 },
+                "member": {
+                    "$ref": "#/definitions/model.User"
+                },
                 "member_id": {
                     "type": "integer"
                 },
@@ -11812,6 +12236,9 @@
                 "region_id": {
                     "type": "integer"
                 },
+                "sales_sources": {
+                    "$ref": "#/definitions/model.SalesSources"
+                },
                 "sales_sources_id": {
                     "type": "integer"
                 },
@@ -11823,23 +12250,50 @@
         "model.SalesRefund": {
             "type": "object",
             "properties": {
-                "accountId": {
+                "amountTotal": {
+                    "description": "浠风◣鍚堣",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
+                "bankAccountId": {
+                    "description": "璐︽埛id",
                     "type": "integer"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
                 },
                 "clientId": {
                     "type": "integer"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
                 },
                 "id": {
                     "type": "integer"
                 },
                 "isInvoice": {
-                    "type": "integer"
+                    "type": "string"
+                },
+                "member": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "memberId": {
                     "type": "integer"
                 },
                 "number": {
                     "type": "string"
+                },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
+                "paymentTypeId": {
+                    "description": "鏀舵鏂瑰紡ID",
+                    "type": "integer"
                 },
                 "products": {
                     "type": "array",
@@ -11853,16 +12307,53 @@
                 "refundDate": {
                     "type": "string"
                 },
-                "refundMethod": {
-                    "type": "string"
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.RefundSourceType"
+                        }
+                    ]
                 }
             }
         },
         "model.SalesReturn": {
             "type": "object",
             "properties": {
+                "Member": {
+                    "$ref": "#/definitions/model.User"
+                },
+                "SalesReturnStatus": {
+                    "description": "閫�璐х姸鎬�",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.SalesReturnStatus"
+                        }
+                    ]
+                },
+                "amountHasRefund": {
+                    "description": "宸查��娆鹃噾棰�",
+                    "type": "number"
+                },
+                "amountShouldRefund": {
+                    "description": "搴旈��娆鹃噾棰�",
+                    "type": "number"
+                },
+                "client": {
+                    "$ref": "#/definitions/model.Client"
+                },
                 "clientId": {
                     "type": "integer"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
                 },
                 "id": {
                     "type": "integer"
@@ -11874,22 +12365,38 @@
                     "type": "string"
                 },
                 "products": {
+                    "description": "閫�璐т骇鍝�",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
                 },
                 "reason": {
+                    "description": "閫�璐у師鍥�",
                     "type": "string"
                 },
                 "repository": {
                     "type": "string"
                 },
                 "returnDate": {
+                    "description": "閫�璐ф棩鏈�",
                     "type": "string"
                 },
-                "salesReturnStatus": {
+                "salesReturnStatusId": {
+                    "description": "閫�璐х姸鎬乮d",
                     "type": "integer"
+                },
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -11933,6 +12440,18 @@
                     "description": "閲戦",
                     "type": "number"
                 },
+                "amountReceivable": {
+                    "description": "搴旀敹閲戦",
+                    "type": "number"
+                },
+                "amountReceived": {
+                    "description": "宸叉敹閲戦",
+                    "type": "number"
+                },
+                "amountTotal": {
+                    "description": "鎬婚",
+                    "type": "number"
+                },
                 "collectionDate": {
                     "description": "璁″垝鏀舵鏃ユ湡",
                     "type": "string"
@@ -11970,10 +12489,14 @@
                 },
                 "sourceType": {
                     "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.CollectionSourceType"
+                        }
+                    ]
                 },
                 "status": {
-                    "description": "鐘舵�侊紙1鏈敹2宸叉敹锛�",
+                    "description": "鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�",
                     "allOf": [
                         {
                             "$ref": "#/definitions/constvar.CollectionStatus"
@@ -12004,6 +12527,10 @@
                     "description": "宸叉敹閲戦",
                     "type": "number"
                 },
+                "amountTotal": {
+                    "description": "浠风◣鍚堣",
+                    "type": "number"
+                },
                 "amountUnInvoiced": {
                     "description": "鏈紑绁ㄩ噾棰�",
                     "type": "number"
@@ -12025,6 +12552,9 @@
                 },
                 "id": {
                     "type": "integer"
+                },
+                "member": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "memberId": {
                     "type": "integer"
@@ -12269,12 +12799,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "product": {
-                    "$ref": "#/definitions/model.Product"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -12304,6 +12835,14 @@
                 "serviceContractId": {
                     "description": "鏈嶅姟鍚堝悓id",
                     "type": "integer"
+                },
+                "serviceMan": {
+                    "description": "鏈嶅姟浜哄憳",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "serviceManId": {
                     "description": "鏈嶅姟浜哄憳",
@@ -12418,8 +12957,14 @@
                 "id": {
                     "type": "integer"
                 },
+                "masterOrder": {
+                    "$ref": "#/definitions/model.MasterOrder"
+                },
                 "masterOrderId": {
                     "type": "integer"
+                },
+                "member": {
+                    "$ref": "#/definitions/model.User"
                 },
                 "memberId": {
                     "type": "integer"
@@ -12634,6 +13179,10 @@
                 },
                 "contact": {
                     "$ref": "#/definitions/request.Contact"
+                },
+                "contact_id": {
+                    "description": "鑱旂郴浜篒D",
+                    "type": "integer"
                 },
                 "country_id": {
                     "type": "integer"
@@ -13249,6 +13798,13 @@
         "request.AddReceipt": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "鏀舵閲戦",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
                 "bankAccountId": {
                     "description": "璐︽埛id",
                     "type": "integer"
@@ -13268,9 +13824,20 @@
                     "description": "甯佺",
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
                 "paymentTypeId": {
                     "description": "鏀舵鏂瑰紡ID",
                     "type": "integer"
+                },
+                "principal": {
+                    "description": "璐熻矗浜篿d",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "principalId": {
                     "description": "璐熻矗浜篿d",
@@ -13290,7 +13857,11 @@
                 },
                 "sourceType": {
                     "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.ReceiptSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -13765,6 +14336,10 @@
                 "contact": {
                     "$ref": "#/definitions/request.Contact"
                 },
+                "contact_id": {
+                    "description": "鑱旂郴浜篒D",
+                    "type": "integer"
+                },
                 "country_id": {
                     "type": "integer"
                 },
@@ -13933,9 +14508,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -14206,6 +14785,28 @@
                 }
             }
         },
+        "request.CheckClientName": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
+        "request.CommonIds": {
+            "type": "object",
+            "required": [
+                "ids"
+            ],
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "request.Contact": {
             "type": "object",
             "properties": {
@@ -14294,6 +14895,17 @@
                 }
             }
         },
+        "request.DeleteContract": {
+            "type": "object",
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
         "request.DeleteCountry": {
             "type": "object",
             "properties": {
@@ -14304,6 +14916,17 @@
             }
         },
         "request.DeleteFollowRecord": {
+            "type": "object",
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "request.DeleteMasterOrder": {
             "type": "object",
             "properties": {
                 "ids": {
@@ -14325,7 +14948,7 @@
                 }
             }
         },
-        "request.DeleteSalesLeads": {
+        "request.DeleteQuotation": {
             "type": "object",
             "properties": {
                 "ids": {
@@ -14336,7 +14959,18 @@
                 }
             }
         },
-        "request.DeleteServiceContract": {
+        "request.DeleteSaleChance": {
+            "type": "object",
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "request.DeleteSalesLeads": {
             "type": "object",
             "properties": {
                 "ids": {
@@ -14359,6 +14993,17 @@
             }
         },
         "request.DeleteServiceFollowup": {
+            "type": "object",
+            "properties": {
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            }
+        },
+        "request.DeleteSubOrder": {
             "type": "object",
             "properties": {
                 "ids": {
@@ -14491,9 +15136,6 @@
         "request.GetContractList": {
             "type": "object",
             "properties": {
-                "keyword": {
-                    "type": "string"
-                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -14501,6 +15143,11 @@
                 "pageSize": {
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
+                },
+                "search_map": {
+                    "description": "鎼滅储鏉′欢: map[string]interface{} {\"member_name\": \"閿�鍞礋璐d汉\", \"number\": \"鍚堝悓缂栧彿\", \"created_at\": \"鍒涘缓鏃堕棿\"}",
+                    "type": "object",
+                    "additionalProperties": true
                 }
             }
         },
@@ -14538,7 +15185,7 @@
                     "type": "integer"
                 },
                 "search_map": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔"}",
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔", \"sales_leads_id\": \"閿�鍞嚎绱d\", \"sale_chance_id\": \"閿�鍞満浼歩d\"}",
                     "type": "object",
                     "additionalProperties": true
                 }
@@ -14547,9 +15194,6 @@
         "request.GetMasterOrderList": {
             "type": "object",
             "properties": {
-                "keyword": {
-                    "type": "string"
-                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -14557,6 +15201,11 @@
                 "pageSize": {
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
+                },
+                "search_map": {
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"閿�鍞�诲崟鍙穃", \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐d汉\", \"start_time\": \"寮�濮嬫椂闂碶", \"end_time\": \"缁撴潫鏃堕棿\", \"money\": \"鎬婚噾棰漒", \"member_name\": \"璐熻矗浜篭"}",
+                    "type": "object",
+                    "additionalProperties": true
                 }
             }
         },
@@ -14603,8 +15252,8 @@
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
                 },
-                "searchMap": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d}",
+                "search_map": {
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐d汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
                     "type": "object",
                     "additionalProperties": true
                 }
@@ -14671,6 +15320,9 @@
                 "keyword": {
                     "type": "string"
                 },
+                "keywordType": {
+                    "$ref": "#/definitions/constvar.SalesRefundKeywordType"
+                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -14686,6 +15338,9 @@
             "properties": {
                 "keyword": {
                     "type": "string"
+                },
+                "keywordType": {
+                    "$ref": "#/definitions/constvar.SalesReturnKeywordType"
                 },
                 "page": {
                     "description": "椤电爜",
@@ -14795,9 +15450,6 @@
         "request.GetSubOrderList": {
             "type": "object",
             "properties": {
-                "keyword": {
-                    "type": "string"
-                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -14805,6 +15457,11 @@
                 "pageSize": {
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
+                },
+                "search_map": {
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"閿�鍞瓙鍗曞彿\", \"client_name\": \"瀹㈡埛鍚嶇О\", \"master_order_number\": \"閿�鍞�诲崟鍙穃", \"member_name\": \"閿�鍞礋璐d汉\", \"master_order_id\": \"閿�鍞�诲崟id\"}",
+                    "type": "object",
+                    "additionalProperties": true
                 }
             }
         },
@@ -15019,21 +15676,30 @@
         },
         "request.SalesRefund": {
             "type": "object",
+            "required": [
+                "sourceId",
+                "sourceType"
+            ],
             "properties": {
-                "accountId": {
+                "bankAccountId": {
+                    "description": "璐︽埛id",
                     "type": "integer"
                 },
                 "clientId": {
                     "type": "integer"
                 },
                 "isInvoice": {
-                    "type": "integer"
+                    "type": "string"
                 },
                 "memberId": {
                     "type": "integer"
                 },
                 "number": {
                     "type": "string"
+                },
+                "paymentTypeId": {
+                    "description": "鏀舵鏂瑰紡ID",
+                    "type": "integer"
                 },
                 "products": {
                     "type": "array",
@@ -15047,8 +15713,17 @@
                 "refundDate": {
                     "type": "string"
                 },
-                "refundMethod": {
-                    "type": "string"
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "鏉ユ簮绫诲瀷锛�1閿�鍞��娆惧崟锛�",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.RefundSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -15065,22 +15740,38 @@
                     "type": "string"
                 },
                 "products": {
+                    "description": "閫�璐т骇鍝�",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
                 },
                 "reason": {
+                    "description": "閫�璐у師鍥�",
                     "type": "string"
                 },
                 "repository": {
                     "type": "string"
                 },
                 "returnDate": {
+                    "description": "閫�璐ф棩鏈�",
                     "type": "string"
                 },
-                "status": {
+                "salesReturnStatusId": {
+                    "description": "閫�璐х姸鎬乮d",
                     "type": "integer"
+                },
+                "sourceId": {
+                    "description": "婧愬崟id",
+                    "type": "integer"
+                },
+                "sourceType": {
+                    "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.SalesReturnSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -15239,6 +15930,10 @@
                 },
                 "contact": {
                     "$ref": "#/definitions/request.Contact"
+                },
+                "contact_id": {
+                    "description": "鑱旂郴浜篒D",
+                    "type": "integer"
                 },
                 "country_id": {
                     "type": "integer"
@@ -16156,6 +16851,13 @@
         "request.UpdateReceipt": {
             "type": "object",
             "properties": {
+                "amount": {
+                    "description": "鏀舵閲戦",
+                    "type": "number"
+                },
+                "bankAccount": {
+                    "$ref": "#/definitions/model.BankAccount"
+                },
                 "bankAccountId": {
                     "description": "璐︽埛id",
                     "type": "integer"
@@ -16175,9 +16877,20 @@
                     "description": "甯佺",
                     "type": "string"
                 },
+                "paymentType": {
+                    "$ref": "#/definitions/model.PaymentType"
+                },
                 "paymentTypeId": {
                     "description": "鏀舵鏂瑰紡ID",
                     "type": "integer"
+                },
+                "principal": {
+                    "description": "璐熻矗浜篿d",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "principalId": {
                     "description": "璐熻矗浜篿d",
@@ -16197,7 +16910,11 @@
                 },
                 "sourceType": {
                     "description": "鏉ユ簮绫诲瀷锛�1閿�鍞槑缁嗗崟2鏈嶅姟鍚堝悓3閿�鍞彂绁�4鏀舵璁″垝5鍑哄簱鍗曪級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.ReceiptSourceType"
+                        }
+                    ]
                 }
             }
         },
@@ -16712,6 +17429,18 @@
                     "description": "閲戦",
                     "type": "number"
                 },
+                "amountReceivable": {
+                    "description": "搴旀敹閲戦",
+                    "type": "number"
+                },
+                "amountReceived": {
+                    "description": "宸叉敹閲戦",
+                    "type": "number"
+                },
+                "amountTotal": {
+                    "description": "鎬婚",
+                    "type": "number"
+                },
                 "collectionDate": {
                     "description": "璁″垝鏀舵鏃ユ湡",
                     "type": "string"
@@ -16749,10 +17478,14 @@
                 },
                 "sourceType": {
                     "description": "婧愬崟绫诲瀷锛�1閿�鍞槑缁�2鏈嶅姟鍚堝悓3閿�鍞彂绁級",
-                    "type": "integer"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.CollectionSourceType"
+                        }
+                    ]
                 },
                 "status": {
-                    "description": "鐘舵�侊紙1鏈敹2宸叉敹锛�",
+                    "description": "鐘舵�侊紙1鏈敹2閮ㄥ垎宸叉敹3宸叉敹锛�",
                     "allOf": [
                         {
                             "$ref": "#/definitions/constvar.CollectionStatus"
@@ -16913,6 +17646,10 @@
                 },
                 "contact": {
                     "$ref": "#/definitions/request.Contact"
+                },
+                "contact_id": {
+                    "description": "鑱旂郴浜篒D",
+                    "type": "integer"
                 },
                 "country_id": {
                     "type": "integer"
@@ -17089,9 +17826,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -17414,6 +18155,17 @@
                 }
             }
         },
+        "response.ContactInformationResponse": {
+            "type": "object",
+            "properties": {
+                "list": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/model.ContactInformation"
+                    }
+                }
+            }
+        },
         "response.ContactResponse": {
             "type": "object",
             "properties": {

--
Gitblit v1.8.0