Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

@@ -2,7 +2,7 @@ package query
 
 
 type ListDividendOrdersQuery struct {
 type ListDividendOrdersQuery struct {
 	// 合伙人类别
 	// 合伙人类别
-	PartnerId  string `json:"partnerId"`
+	PartnerId  int    `json:"partner"`
 	SearchText string `json:"searchText"`
 	SearchText string `json:"searchText"`
 	PageSize   int    `json:"pageSize"`
 	PageSize   int    `json:"pageSize"`
 	PageNumber int    `json:"pageNumber"`
 	PageNumber int    `json:"pageNumber"`

@@ -67,7 +67,7 @@ func (dao *OrderDao) GetDividendOrders(options map[string]interface{}) (count in
 	if v, ok := options["orderType"]; ok {
 	if v, ok := options["orderType"]; ok {
 		q.Where(`"order".order_type=?`, v)
 		q.Where(`"order".order_type=?`, v)
 	}
 	}
-	if v, ok := options["partnerId"]; ok && len(v.(string)) > 0 {
+	if v, ok := options["partnerId"]; ok && v.(int) > 0 {
 		q.Where(`"order".partner_id =?`, v)
 		q.Where(`"order".partner_id =?`, v)
 	}
 	}
 	if v, ok := options["offset"]; ok {
 	if v, ok := options["offset"]; ok {