fix:merge

models/data_manage/edb_info.go

@@ -223,14 +223,8 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 // 	SortRule     int    `form:"SortRule" description:"排序方式: 0-默认; 1-正序; 2-倒序"`
 // }
 
-<<<<<<< HEAD
 // BatchAddCheckReq 指标批量添加校验
 type BatchAddCheckReq struct {
-=======
-// MysteelChemicalDataBatchAddCheckReq 上海钢联指标批量添加校验
-type MysteelChemicalDataBatchAddCheckReq struct {
->>>>>>> 1f86464e7c6f8b58f4b0b107969f981d10c72275
-	// MysteelChemicalDataListReq
 	IndexCodes []string `form:"IndexCodes" description:"全选为false时, 该数组为选中; 全选为true时, 该数组为不选的指标"`
 }