处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/eMatchingStatus.cs

@@ -8,13 +8,13 @@
        /// <summary>
        ///匹配成功
        /// </summary>
        [Display(Name = "匹配成功")]
        [Display(Name = "成功")]
        Succeed = 0,

        /// <summary>
        ///匹配失败
        /// </summary>
        [Display(Name = "匹配失败")]
        [Display(Name = "失败")]
        Failed = 1,
    }
}