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

duheng

2025-03-12 cec8d92bdca1da0b2eafe6eb3130f4bf6f03028b

 WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/HydrantViewModel.cs

@@ -30,7 +30,7 @@
            }
            this.Name = rhs.Name;
            this.SortCode = rhs.SortCode;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.MinorLoss = rhs.MinorLoss;
        }

@@ -55,7 +55,7 @@
            }
            this.Description = rhs.Description;
            this.Name = rhs.Name;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.SortCode = rhs.SortCode;
            this.MinorLoss = rhs.MinorLoss;
        }