Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-11 ae6883ce426727efca4facab973d814ae66c69c2

 api/v1/subOrder.go

@@ -134,7 +134,7 @@
      return
   }

   subOrders, errCode := subOrderService.GetSubOrderList(params.Page, params.PageSize, params.Keyword)
   subOrders, total, errCode := subOrderService.GetSubOrderList(params.Page, params.PageSize, params.Keyword)
   if errCode != ecode.OK {
      ctx.Fail(errCode)
      return
@@ -142,6 +142,6 @@

   ctx.OkWithDetailed(response.SubOrderResponse{
      List: subOrders,
      Count: len(subOrders),
      Count: int(total),
   })
}
}