Merge branch 'dm' of http://8.136.199.33:3000/eta_gn_server/eta_api into feature/bi_approve

models/system/sys_department.go

@@ -10,7 +10,7 @@ type SysDepartmentAddReq struct {
 }
 
 type SysDepartment struct {
-	DepartmentId   int       `orm:"column(department_id);pk" description:"部门Id"`
+	DepartmentId   int       `gorm:"primaryKey;" description:"部门Id"`
 	DepartmentName string    `description:"部门名称"`
 	Sort           int       `description:"排序"`
 	CreateTime     time.Time `description:"创建时间"`

models/system/sys_user.go

@@ -27,7 +27,8 @@ type LoginResp struct {
 }
 
 type Admin struct {
-	AdminId                   int    `orm:"column(admin_id);pk" description:"系统用户id"`
+	//AdminId                   int    `grm:"column:admin_id;identity:true" description:"系统用户id"`
+	AdminId                   int    `gorm:"primaryKey;autoIncrement;column:admin_id"`
 	AdminName                 string `description:"系统用户名称"`
 	AdminAvatar               string `description:"用户头像"`
 	RealName                  string `description:"系统用户姓名"`