fix:merge

services/data/excel/time_table.go

@@ -7,21 +7,13 @@ import (
 	"eta/eta_api/services/data"
 	"eta/eta_api/utils"
 	"fmt"
-<<<<<<< HEAD
-=======
-	"github.com/shopspring/decimal"
->>>>>>> a141b3ff82d3ffc839bc5643e61f0dc1fb65830e
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
-<<<<<<< HEAD
 	"github.com/shopspring/decimal"
 	"github.com/yidane/formula"
-=======
-	"github.com/dengsgo/math-engine/engine"
->>>>>>> a141b3ff82d3ffc839bc5643e61f0dc1fb65830e
 )
 
 // TableDataConfig