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

chenhaozhe

4 天以前 da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a

 WebAPI/Controllers/工资管理/HR_PostSkillBillController.cs

@@ -667,7 +667,7 @@
                }

                //杩斿洖鍒楄〃淇℃伅
                ds = oCn.RunProcReturn("select * from h_v_HR_PostSkillBillMainList where 1=1 and hmainid=" + HInterID + " order by hmainid desc", "h_v_HR_PostSkillBillMainList");
                ds = oCn.RunProcReturn("select * from h_v_HR_PostSkillBillMainEdit where 1=1 and hmainid=" + HInterID + " order by hmainid desc", "h_v_HR_PostSkillBillMainEdit");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";