Merge remote-tracking branch 'origin/master'

wangpengfei

2023-08-24 20f6ea1b89070f17b1d9f47e9c5e349f0c87c37d

 model/serviceOrder.go

@@ -54,6 +54,7 @@
      Solution             string             `gorm:"column:solution;type:varchar(255);not null;default:'';comment:解决方法" json:"solution"`              // 解决方法
      SolutionRemark       string             `gorm:"column:solution_remark;type:varchar(255);not null;default:'';comment:内部备注" json:"solutionRemark"` // 内部备注
      Remark               string             `gorm:"column:remark;type:varchar(255);not null;default:'';comment:备注" json:"remark"`                    // 备注
      CrmModel
   }

   // ServiceOrderSearch 服务单搜索条件
@@ -69,7 +70,7 @@
   }
)

func (ServiceOrder) TableName() string {
func (slf *ServiceOrder) TableName() string {
   return "service_order"
}