Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

6 天以前 80a908596cb1d1faac6b0f54f68182ad22303814

 WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs

@@ -63,7 +63,7 @@
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                objJsonResult.list = columnNameList;//将columnNameList赋值给objJsonResult的list属性
                return objJsonResult;
            }
            catch (Exception e)