Merge branch 'dev'

api/dao/product.go

@@ -150,6 +150,10 @@ func (r *ProductDao) GetProductPageSearch(req requests.GetProductPage, page, pag
 	// 排序
 	if req.Order != nil {
 		if req.Order.Stock != "" {
+			if req.Order.Stock != "desc" && req.Order.Stock != "asc" {
+				return nil, 0, errors.New("排序字段错误")
+			}
+
 			query = query.Joins("JOIN gdxz_product_platform_amount ON gdxz_product_platform_amount.product_platform_id = gdxz_product.product_platform_id").
 				Order("gdxz_product_platform_amount.stock " + req.Order.Stock)
 		}

api/requests/product.go

@@ -71,7 +71,7 @@ type GetProductList struct {
 }
 
 type GetProductPageOrder struct {
-	Stock string `json:"stock" form:"stock" label:"库存" validate:"oneof=desc asc"`
+	Stock string `json:"stock" form:"stock" label:"库存"`
 }
 
 // AddProduct 新增商品