Merge branch 'master' into develop

2017-08-11 19:14:47 +08:00 · 2017-08-11 19:14:47 +08:00 · 6cd9d12fbe
parent b8040300b6 c8afe5d86a
commit 6cd9d12fbe
1 changed files with 4 additions and 0 deletions
--- a/generate/swaggergen/g_docs.go
+++ b/generate/swaggergen/g_docs.go
@ -866,6 +866,10 @@ func getModel(str string) (objectname string, m swagger.Schema, realTypes []stri
 					if k != objectname {
 						continue
 					}
+					// check package
+					if len(strs) > 1 && pkg.Name != strs[len(strs)-2] {
+						continue
+					}
 					packageName = pkg.Name
 					parseObject(d, k, &m, &realTypes, astPkgs, pkg.Name)
 				}