冲突fix

models/edb_data_base.go

@@ -249,15 +249,3 @@ type EditEdbBaseInfoReq struct {
 	UnitEn          string `description:"英文单位"`
 	ClassifyId      int    `description:"分类id"`
 }
-
-func DelEdbDataByMysql(to orm.TxOrmer, edbInfoId int, tableName string, removeDateList []string) (err error) {
-	if len(removeDateList) <= 0 {
-		return
-	}
-	// 移除不存在的日期数据
-	removeDateStr := strings.Join(removeDateList, `","`)
-	removeDateStr = `"` + removeDateStr + `"`
-	sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
-	_, err = to.Raw(sql, edbInfoId).Exec()
-	return
-}