From 6a3d1f8ab19830adde3a653f48f89fd7c88afbde Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 13 五月 2022 16:03:59 +0800
Subject: [PATCH] 代理商功能优化 产品功能优化 增加产品分类功能 用户功能优化

---
 web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 0d450e5..2fa7cbb 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
-4e3d3c0d46e0394eded6a28ceeaec6a8f69625db
+<<<<<<< HEAD
+0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
+=======
+ffceac74583ffe022717b2538e55c4e28b8e84c0
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1