Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api

wbc

5 天以前 f56fcadd8d412fa1a65c873e77ad04ebb31fc954

 StandardPda/MES.Service/service/BasicData/OrganizeManager.cs

@@ -225,7 +225,8 @@
        conModels.Add(new ConditionalModel
        {
            FieldName = typeof(Organize).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal, FieldValue = "1"
            ConditionalType = ConditionalType.Equal,
            FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());