Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

8 天以前 800f1652b2ed0473850975efe5028685bcd605c4

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs

@@ -331,7 +331,8 @@
            {
                lineNo = lineNo,
                date = date,
                list = list
                list = list,
                orgId = orgId
            };

            try
@@ -458,7 +459,8 @@
            {
                lineNo = lineNo,
                date = date,
                list = list
                list = list,
                orgId = orgId
            };

            try