aps/crm.git - Gitblit

parent: 037900f7 | 补丁 | 提交 | ignore whitespace

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

4个文件已修改

	docs/docs.go	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.json	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.yaml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	model/request/serviceContract.go	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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

@@ -10,22 +10,24 @@
}

type ServiceContract struct {
    ClientId       int              `json:"clientId"`
    Number         string           `json:"number"`
    MemberId       int              `json:"memberId" binding:"required"`
    ContactId      int              `json:"contactId"`
    SaleChanceId   int              `json:"saleChanceId"`
    SalesDetailsId int              `json:"salesDetailsId"`
    QuotationId    int              `json:"quotationId"`
    TypeId         int              `json:"typeId"`
    SignTime       string           `json:"signTime" binding:"datetime=2006-01-02"`
    StartTime      string           `json:"startTime"`
    EndTime        string           `json:"endTime"`
    StatusId       int              `json:"statusId"`
    ServiceTimes   int              `json:"serviceTimes"`
    Terms          string           `json:"terms"`
    Remark         string           `json:"remark"`
    Products       []*model.Product `json:"products"`
    ClientId                int              `json:"clientId"`
    Number                  string           `json:"number"`
    MemberId                int              `json:"memberId" binding:"required"`
    ContactId               int              `json:"contactId"`
    SaleChanceId            int              `json:"saleChanceId"`
    SalesDetailsId          int              `json:"salesDetailsId"`
    QuotationId             int              `json:"quotationId"`
    TypeId                  int              `json:"typeId"`
    SignTime                string           `json:"signTime" binding:"datetime=2006-01-02"`
    StartTime               string           `json:"startTime"`
    EndTime                 string           `json:"endTime"`
    StatusId                int              `json:"statusId"`
    ServiceTimes            int              `json:"serviceTimes"`
    Terms                   string           `json:"terms"`
    Remark                  string           `json:"remark"`
    Products                []*model.Product `json:"products"`
    ServiceContractTypeId   int              `json:"serviceContractTypeId"`
    ServiceContractStatusId int              `json:"serviceContractStatusId"`
}

type UpdateServiceContract struct {

			@@ -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"
			},

			@@ -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"
			},

			@@ -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:

			@@ -10,22 +10,24 @@
			}

			type ServiceContract struct {
			ClientId int `json:"clientId"`
			Number string `json:"number"`
			MemberId int `json:"memberId" binding:"required"`
			ContactId int `json:"contactId"`
			SaleChanceId int `json:"saleChanceId"`
			SalesDetailsId int `json:"salesDetailsId"`
			QuotationId int `json:"quotationId"`
			TypeId int `json:"typeId"`
			SignTime string `json:"signTime" binding:"datetime=2006-01-02"`
			StartTime string `json:"startTime"`
			EndTime string `json:"endTime"`
			StatusId int `json:"statusId"`
			ServiceTimes int `json:"serviceTimes"`
			Terms string `json:"terms"`
			Remark string `json:"remark"`
			Products []*model.Product `json:"products"`
			ClientId int `json:"clientId"`
			Number string `json:"number"`
			MemberId int `json:"memberId" binding:"required"`
			ContactId int `json:"contactId"`
			SaleChanceId int `json:"saleChanceId"`
			SalesDetailsId int `json:"salesDetailsId"`
			QuotationId int `json:"quotationId"`
			TypeId int `json:"typeId"`
			SignTime string `json:"signTime" binding:"datetime=2006-01-02"`
			StartTime string `json:"startTime"`
			EndTime string `json:"endTime"`
			StatusId int `json:"statusId"`
			ServiceTimes int `json:"serviceTimes"`
			Terms string `json:"terms"`
			Remark string `json:"remark"`
			Products []*model.Product `json:"products"`
			ServiceContractTypeId int `json:"serviceContractTypeId"`
			ServiceContractStatusId int `json:"serviceContractStatusId"`
			}

			type UpdateServiceContract struct {