Automatic merge from release/2.1.0 -> release/2.2.0

* commit '53e1f07f18062d249a88da0fa274c3af11daa21e':
  允许list description
This commit is contained in:
邱剑
2018-10-11 12:02:18 +08:00
+1 -1
View File
@@ -22,7 +22,7 @@ type SStandaloneResourceBase struct {
Name string `width:"128" charset:"utf8" nullable:"false" index:"true" list:"user" update:"user" create:"required"`
ExternalId string `width:"256" charset:"ascii" index:"true" list:"admin" create:"admin_optional"`
Description string `width:"256" charset:"utf8" get:"user" update:"user" create:"optional"`
Description string `width:"256" charset:"utf8" get:"user" list:"user" update:"user" create:"optional"`
IsEmulated bool `nullable:"false" default:"false" list:"admin" update:"true" create:"admin_optional"`
}