合并冲突

2026-07-04 14:09:46 +08:00
parent 478fc26a4e
commit 66ad7cd058
1 changed files with 1 additions and 0 deletions
--- a/Service/Application.Domain/Enum/GoodsEnum.cs
+++ b/Service/Application.Domain/Enum/GoodsEnum.cs
@@ -19,6 +19,7 @@ public static class GoodsEnum
        Exp,//经验
        State,//状态物品
        Ship,//船只
        Practise,//修炼道具
    }
    public enum  DrugCls