Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-09 da0da2d1238555c4ff488dbaaae1371ba4cf6827

 src/Bro.M071.DBManager/MeasurementUnitResultManager.cs

@@ -72,11 +72,11 @@
                            //into pmList
                            select new MeasurementUnitResult_DTO
                            {
                                ProductionMeasurementRecord= productionMeasurementRecords,
                                MeasurementUnitResult= measurementUnitResult
                                ProductionCode = productionMeasurementRecords.ProductionCode,
                                ProductionBarcode = productionMeasurementRecords.ProductionBarcode

                            };
                var pageList = query.OrderBy(u => u.ProductionMeasurementRecord.OperationStartTime).ToPagedList(request);
                var pageList = query.OrderBy(u => u.CREATE_TIME).ToPagedList(request);
                request.TotalNum = mList.Count();
                return pageList;
            }