Merge remote-tracking branch 'origin/master'

啊鑫

9 天以前 79e43ccffd15afcd99934ee43b706f6133398079

 MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs

@@ -41,12 +41,14 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetProductionPickPage(entity);
            var productionPickPage = m.GetProductionPickPage(entity);
            resultInfos.tbBillList = productionPickPage.Items;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
                data = resultInfos,
                TotalCount = productionPickPage.TotalCount
            };
        }
        catch (Exception ex)