Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-12-04 3886a51f03ec14650e5b7127539104ad40e496da

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/07-curve/02-set/SetHydroCurveCtrl.cs

@@ -23,7 +23,7 @@
        /// <summary>
        /// 
        /// </summary>
        public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroCurveInfo curveInfo, string curveType)
        public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroCurveInfo curveInfo, string curve, string curveType)
        {
            if (hydroInfo == null)
            {
@@ -41,7 +41,7 @@
            this.txtCode.EditValue = _curveInfo.Code;
            this.txtName.EditValue = _curveInfo.Name;
            this.txtDescription.EditValue = _curveInfo.Description;
            switch (curveType)
            switch (curve)
            {
                case HydroCurve.TankVol:
                    {