Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-24 d54baf16f7d0e9ad4a26a9650f02a3089d57c2db

Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

 docs/docs.go

@@ -14385,6 +14385,12 @@
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractStatusId": {
                    "type": "integer"
                },
                "serviceContractTypeId": {
                    "type": "integer"
                },
                "serviceTimes": {
                    "type": "integer"
                },
@@ -17668,6 +17674,12 @@
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractStatusId": {
                    "type": "integer"
                },
                "serviceContractTypeId": {
                    "type": "integer"
                },
                "serviceTimes": {
                    "type": "integer"
                },

 docs/swagger.json

@@ -14373,6 +14373,12 @@
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractStatusId": {
                    "type": "integer"
                },
                "serviceContractTypeId": {
                    "type": "integer"
                },
                "serviceTimes": {
                    "type": "integer"
                },
@@ -17656,6 +17662,12 @@
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractStatusId": {
                    "type": "integer"
                },
                "serviceContractTypeId": {
                    "type": "integer"
                },
                "serviceTimes": {
                    "type": "integer"
                },

 docs/swagger.yaml

@@ -2854,6 +2854,10 @@
        type: integer
      salesDetailsId:
        type: integer
      serviceContractStatusId:
        type: integer
      serviceContractTypeId:
        type: integer
      serviceTimes:
        type: integer
      signTime:
@@ -5098,6 +5102,10 @@
        type: integer
      salesDetailsId:
        type: integer
      serviceContractStatusId:
        type: integer
      serviceContractTypeId:
        type: integer
      serviceTimes:
        type: integer
      signTime:

 model/request/serviceContract.go

@@ -26,6 +26,8 @@
    Terms          string           `json:"terms"`
    Remark         string           `json:"remark"`
    Products       []*model.Product `json:"products"`
    ServiceContractTypeId   int              `json:"serviceContractTypeId"`
    ServiceContractStatusId int              `json:"serviceContractStatusId"`
}

type UpdateServiceContract struct {