Merge branch 'zq'

zhangqian

2023-08-17 0b3bcdad216e73b43dec04db4a4792efefef0e37

 model/serviceOrder.go

@@ -27,6 +27,7 @@
      ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:服务方式id" json:"serviceTypeId"`               // 服务方式id
      ServiceType          ServiceType        `gorm:"foreignKey:ServiceTypeId"`
      ServiceManId         int                `gorm:"column:service_man_id;type:int;not null;default:0;comment:服务人员" json:"serviceManId"` // 服务人员
      ServiceMan           User               `gorm:"foreignKey:ServiceManId" json:"serviceMan"`                                          // 服务人员
      ContactId            int                `gorm:"linkman_id" json:"contactId"`                                                        // 联系人id
      Contact              Contact            `gorm:"foreignKey:ContactId"`
      Address              string             `gorm:"column:address;type:varchar(255);not null;default:'';comment:上门地址" json:"address"`           // 上门地址
@@ -96,6 +97,7 @@
         Preload("SalesDetails").
         Preload("ServiceType").
         Preload("Contact").
         Preload("ServiceMan").
         Preload("PriorityLevel").
         Preload("SaleChance").
         Preload("FaultType").