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

yangle

2022-11-01 4c5ff8c2bf65237b9200c5279c4f158c938806da

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

 WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs

@@ -53,16 +53,8 @@
                    string sql = sql1 + sWhere+ " order by 货币代码";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CurrencyList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {


                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
@@ -77,7 +69,6 @@
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {