Merge remote-tracking branch 'origin/master'

啊鑫

3 天以前 79e43ccffd15afcd99934ee43b706f6133398079

 MES.Service/service/QC/XJService.cs

@@ -185,7 +185,8 @@
        return db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "2"
                        && b.ItemNo == itemNo).Select(
                        && b.ItemNo == itemNo
                        && b.ProcId == procid).Select(
                b => new QsQaItemXj01
                {
                    ProjName = b.ProjName,