Automatic merge from release/2.1.0 -> release/2.2.0

* commit '5516983e0207c9b87ac8e2fb303b257ab6b6ba0f':
  同步云盘名称
This commit is contained in:
邱剑
2018-09-11 21:52:20 +08:00
+3
View File
@@ -122,6 +122,9 @@ func (self *SDisk) Resize(size int64) error {
}
func (self *SDisk) GetName() string {
if len(self.DiskName) > 0 {
return self.DiskName
}
return self.DiskId
}