mirror of
https://github.com/astaxie/beego.git
synced 2025-06-12 11:10:40 +00:00
Merge branch 'develop' into add-gosimple
This commit is contained in:
@ -92,11 +92,11 @@ func (f StrTo) Int64() (int64, error) {
|
||||
i := new(big.Int)
|
||||
ni, ok := i.SetString(f.String(), 10) // octal
|
||||
if !ok {
|
||||
return int64(v), err
|
||||
return v, err
|
||||
}
|
||||
return ni.Int64(), nil
|
||||
}
|
||||
return int64(v), err
|
||||
return v, err
|
||||
}
|
||||
|
||||
// Uint string to uint
|
||||
@ -130,11 +130,11 @@ func (f StrTo) Uint64() (uint64, error) {
|
||||
i := new(big.Int)
|
||||
ni, ok := i.SetString(f.String(), 10)
|
||||
if !ok {
|
||||
return uint64(v), err
|
||||
return v, err
|
||||
}
|
||||
return ni.Uint64(), nil
|
||||
}
|
||||
return uint64(v), err
|
||||
return v, err
|
||||
}
|
||||
|
||||
// String string to string
|
||||
|
Reference in New Issue
Block a user