Merge branch 'operation-record' of https://github.com/flipped-aurora/gin-vue-admin into operation-record

 Conflicts:
	server/router/sys_auto_code.go
This commit is contained in:
QM303176530
2020-07-05 16:31:06 +08:00
15 changed files with 82 additions and 87 deletions
+1 -1
View File
@@ -74,6 +74,6 @@ func GetSysOperationRecordInfoList(info request.SysOperationRecordSearch) (err e
db = db.Where("status = ?", info.Status)
}
err = db.Count(&total).Error
err = db.Limit(limit).Offset(offset).Find(&sysOperationRecords).Error
err = db.Order("id desc").Limit(limit).Offset(offset).Preload("User").Find(&sysOperationRecords).Error
return err, sysOperationRecords, total
}