Merge branch 'main' into dev-286

pixelmaxQm · web-flow · commit 4c282b0d245b · 2025-10-19T12:27:48.000+08:00
diff --git a/server/service/system/sys_dictionary_detail.go b/server/service/system/sys_dictionary_detail.go
@@ -205,7 +205,7 @@ func (dictionaryDetailService *DictionaryDetailService) GetSysDictionaryDetailIn
 	if err != nil {
 		return
 	}
-	err = db.Limit(limit).Offset(offset).Order("sort").Find(&sysDictionaryDetails).Error
+	err = db.Limit(limit).Offset(offset).Order("sort").Order("id").Find(&sysDictionaryDetails).Error
 	return sysDictionaryDetails, total, err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func (dictionaryDetailService *DictionaryDetailService) GetSysDictionaryDetailIn`
`205`	`205`	`if err != nil {`
`206`	`206`	`return`
`207`	`207`	`}`
`208`		`- err = db.Limit(limit).Offset(offset).Order("sort").Find(&sysDictionaryDetails).Error`
	`208`	`+ err = db.Limit(limit).Offset(offset).Order("sort").Order("id").Find(&sysDictionaryDetails).Error`
`209`	`209`	`return sysDictionaryDetails, total, err`
`210`	`210`	`}`
`211`	`211`