Merge branch 'master' into fly

wangpengfei

2023-08-17 06c0b03df2955475fe39ff2a793a5f151f4da99f

 docs/docs.go

@@ -12773,12 +12773,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "product": {
                    "$ref": "#/definitions/model.Product"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",
@@ -12808,6 +12809,14 @@
                "serviceContractId": {
                    "description": "服务合同id",
                    "type": "integer"
                },
                "serviceMan": {
                    "description": "服务人员",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.User"
                        }
                    ]
                },
                "serviceManId": {
                    "description": "服务人员",
@@ -14473,9 +14482,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",
@@ -17732,9 +17745,13 @@
                    "description": "问题描述",
                    "type": "string"
                },
                "productId": {
                    "description": "产品id",
                    "type": "integer"
                "productName": {
                    "description": "产品名称",
                    "type": "string"
                },
                "productTypeName": {
                    "description": "产品分类名称",
                    "type": "string"
                },
                "realTime": {
                    "description": "实际处理时间",