From 037900f7998925e0c8727338aef3a1b199daa898 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 11:23:24 +0800
Subject: [PATCH] Merge branch 'hotfix'

---
 docs/swagger.yaml |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 2f23a4c..a2e23cf 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -751,6 +751,8 @@
         $ref: '#/definitions/model.Quotation'
       quotationId:
         type: integer
+      serviceContractStatus:
+        $ref: '#/definitions/model.ServiceContractStatus'
       statusId:
         type: integer
       updated_at:
@@ -833,6 +835,8 @@
         $ref: '#/definitions/model.Contact'
       contact_id:
         type: integer
+      contact_information:
+        $ref: '#/definitions/model.ContactInformation'
       contact_information_id:
         type: integer
       content:
@@ -1154,6 +1158,10 @@
       bankAccountId:
         description: 璐︽埛id
         type: integer
+      client:
+        allOf:
+        - $ref: '#/definitions/model.Client'
+        description: 瀹㈡埛id
       clientId:
         description: 瀹㈡埛id
         type: integer
@@ -1411,6 +1419,8 @@
         type: integer
       signTime:
         type: string
+      updateTime:
+        type: string
       wechatOrderStatus:
         $ref: '#/definitions/model.WechatOrderStatus'
       wechatOrderStatusId:
@@ -1513,6 +1523,8 @@
         allOf:
         - $ref: '#/definitions/constvar.RefundSourceType'
         description: 鏉ユ簮绫诲瀷锛�1閿�鍞��璐э級
+      updateTime:
+        type: string
     type: object
   model.SalesReturn:
     properties:
@@ -1565,6 +1577,8 @@
         allOf:
         - $ref: '#/definitions/constvar.SalesReturnSourceType'
         description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+      updateTime:
+        type: string
     type: object
   model.SalesReturnStatus:
     properties:
@@ -1666,6 +1680,10 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       endTime:
         type: string
       id:
@@ -1707,6 +1725,8 @@
       startTime:
         type: string
       terms:
+        type: string
+      updateTime:
         type: string
     type: object
   model.ServiceContractStatus:
@@ -1752,6 +1772,10 @@
         $ref: '#/definitions/model.Contact'
       contactId:
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       file:
         type: string
       id:
@@ -1788,6 +1812,8 @@
         $ref: '#/definitions/model.TimelyRate'
       timelyRateId:
         type: integer
+      updateTime:
+        type: string
     type: object
   model.ServiceOrder:
     properties:
@@ -1815,6 +1841,10 @@
       contactId:
         description: 鑱旂郴浜篿d
         type: integer
+      createTime:
+        type: string
+      creatorName:
+        type: string
       expectTime:
         description: 甯屾湜澶勭悊鏃堕棿
         type: string
@@ -1901,6 +1931,8 @@
       timeSpentId:
         description: 鑺辫垂鏃堕棿
         type: integer
+      updateTime:
+        type: string
     type: object
   model.ServiceOrderStatus:
     properties:
@@ -2519,6 +2551,10 @@
       bankAccountId:
         description: 璐︽埛id
         type: integer
+      client:
+        allOf:
+        - $ref: '#/definitions/model.Client'
+        description: 瀹㈡埛id
       clientId:
         description: 瀹㈡埛id
         type: integer
@@ -4609,6 +4645,10 @@
       bankAccountId:
         description: 璐︽埛id
         type: integer
+      client:
+        allOf:
+        - $ref: '#/definitions/model.Client'
+        description: 瀹㈡埛id
       clientId:
         description: 瀹㈡埛id
         type: integer

--
Gitblit v1.8.0