MOD:merge master

timidsmile · Aug 29, 2018 · 557976f · 557976f
2 parents 5909ca6 + 42e9498
commit 557976f
Show file tree

Hide file tree

Showing 5 changed files with 212 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .DS_Store
 static/images/
 /dist/
@@ -13,3 +14,6 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+=======
+vendor/
+>>>>>>> master
diff --git a/.idea/go.imports.xml b/.idea/go.imports.xml
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/model/userBasic.go b/model/userBasic.go
@@ -0,0 +1,27 @@
+package model
+
+type User struct {
+ BasicMdl
+ UserID string `gorm:"size:32 column:user_id" json:"userID"`
+ UserName string `gorm:"size:32 column:user_name" json:"userName"`
+ mobile string `gorm:"size:32" json:"mobile"`
+ email string `gorm:"size:32" json:"email"`
+ passwd string `gorm:"size:32" json:"passwd"`
+ Nickname string `gorm:"size:32" json:"nickname"`
+ AvatarURL string `gorm:"size:255" json:"avatarURL"`
+ status int8 `gorm:"size:255" json:"status"`
+}
+
+/*
+| id | bigint(64) unsigned | NO | PRI | NULL | auto_increment |
+| user_id | bigint(20) | NO | MUL | NULL | |
+| user_name | varchar(32) | NO | MUL | | |
+| mobile | varchar(11) | NO | | | |
+| email | varchar(50) | NO | MUL | | |
+| passwd | varchar(32) | NO | | | |
+| nick_name | varchar(50) | NO | | | |
+| avata_url | text | YES | | NULL | |
+| create_time | int(10) unsigned | NO | | NULL | |
+| update_time | int(10) unsigned | NO | | NULL | |
+| status | s
+*/