Merge remote-tracking branch 'origin/master'

啊鑫

23 小时以前 79e43ccffd15afcd99934ee43b706f6133398079

 MESApplication/Controllers/QC/LljController.cs

@@ -18,14 +18,15 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var (item, totalCount) = new LljService().GetPage(queryObj);
            var tbBillList =
                new LljService().GetPage(queryObj);
            resultInfos.tbBillList = tbBillList;
                resultInfos.tbBillList = item;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
                data = resultInfos,
                TotalCount = totalCount
            };
        }
        catch (Exception ex)