Merge branch 'bzq/dev' of eta_mini/eta_mini_crm into debug

controllers/seller.go

@@ -101,8 +101,8 @@ func (this *SellerController) List() {
 }
 
 // List
-// @Title 获取部门下销售
-// @Description 获取部门下销售接口
+// @Title 获取营业部下面的部门
+// @Description 获取营业部下面的部门
 // @Success 200 {object} []models.SysDepartmentList
 // @router /department/list [get]
 func (this *SellerController) DepartmentList() {

models/user.go

@@ -43,6 +43,7 @@ type UserView struct {
 	Phone                string `description:"手机号"`
 	AreaCode             string `description:"区号"`
 	Email                string `description:"邮箱"`
+	SellerDepartmentId   int    `description:"营业部门id"`
 	SellerDepartmentName string `description:"营业部门名称"`
 	Company              string `description:"所属公司"`
 	ValidStartTime       string `description:"有效期开始时间"`