Automatic merge from release/2.1.0 -> release/2.2.0

* commit 'c43c79c178e9b654599de672a7782849d0f3daf5':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"

pkg/cloudcommon/db/resourcebase.go

@@ -13,7 +13,7 @@ type SResourceBase struct {
 	SModelBase
 
 	CreatedAt     time.Time `nullable:"false" created_at:"true" get:"user"`
-	UpdatedAt     time.Time `nullable:"false" updated_at:"true"`
+	UpdatedAt     time.Time `nullable:"false" updated_at:"true" list:"user"`
 	UpdateVersion int       `default:"0" nullable:"false" auto_version:"true"`
 	DeletedAt     time.Time ``
 	Deleted       bool      `nullable:"false" default:"false"`

pkg/mcclient/options/base.go

@@ -144,7 +144,7 @@ func ListStructToParams(v interface{}) (*jsonutils.JSONDict, error) {
 type BaseListOptions struct {
 	Limit         *int     `default:"20" help:"Page limit"`
 	Offset        *int     `default:"0" help:"Page offset"`
-	OrderBy       string   `help:"Name of the field to be ordered by"`
+	OrderBy       []string `help:"Name of the field to be ordered by"`
 	Order         string   `help:"List order" choices:"desc|asc"`
 	Details       *bool    `help:"Show more details"`
 	Search        string   `help:"Filter results by a simple keyword search"`