From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs
index 1f19617..43fd5ec 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/PurchaseTypeEnum.cs
@@ -16,19 +16,19 @@
/// <summary>
/// /鑷埗
/// </summary>
- [Description("Self-made - 鑷埗")]
- SelfMade,
+ [Description("鑷埗")]
+ SelfMade = 1,
/// <summary>
/// 閲囪喘
/// </summary>
- [Description("Purchased - 閲囪喘")]
- Purchased,
+ [Description("閲囪喘")]
+ Purchased = 2,
/// <summary>
/// 鍧囧彲
/// </summary>
- [Description("Both - 鍧囧彲")]
- Both
+ [Description("鍧囧彲")]
+ Both = 3
}
}
--
Gitblit v1.9.3