Merge branch 'feature/yb11.10_rai_report' into debug

models/fms/contract_service_template.go

@@ -40,7 +40,7 @@ func (st *ContractServiceTemplate) OrderList(condition string, pars []interface{
 	err = global.DEFAULT_MYSQL.Model(st).
 		Where("is_delete = 0").
 		Where(condition, pars...).
-		Order("sort ASC ").
+		Order("product_id ASC, sort ASC ").
 		Find(&list).Error
 	return
 }