From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource
index acde7a0..c3a7f15 100644
--- a/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource
@@ -6,5 +6,5 @@
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ClsCLD_Customer_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
- <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model, Web References.WebS.Reference.cs, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+ <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
\ No newline at end of file
--
Gitblit v1.9.1