Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'YanShi' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into YanShi

Browse Source 
# Conflicts:
#	Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
This commit is contained in:
liqionghai
2025-08-24 13:07:09 +08:00
parent 160447703b fa17cd7e02
commit 91a6d99251
51 changed files with 2542 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
View File

@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Services</RootNamespace>
<AssemblyName>MyCode.Project.Services</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -115,15 +115,25 @@
<Compile Include="BLL\WebSocketBLL.cs" />
<Compile Include="Implementation\AnsyDataProcessService.cs" />
<Compile Include="Implementation\ApiLogService.cs" />
<<<<<<< HEAD
<Compile Include="Implementation\ZhuBinService.cs" />
<Compile Include="Implementation\PurOrderService.cs" />
=======
<Compile Include="Implementation\PrdOrderService.cs" />
<Compile Include="Implementation\LiQiongHaiService.cs" />
>>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
<Compile Include="Implementation\YuyuboService.cs" />
<Compile Include="Implementation\ReportService.cs" />
<Compile Include="Implementation\QueueProcessService.cs" />
<Compile Include="Implementation\WebSocketService.cs" />
<Compile Include="IServices\IAnsyDataProcessService.cs" />
<<<<<<< HEAD
<Compile Include="IServices\IPurOrderService.cs" />
<Compile Include="IServices\IZhuBinService.cs" />
=======
<Compile Include="IServices\ILiQiongHaiService.cs" />
<Compile Include="IServices\IPrdOrderService.cs" />
>>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
<Compile Include="IServices\IYuyuboService.cs" />
<Compile Include="IServices\IApiLogService.cs" />
<Compile Include="IServices\IItemListService.cs" />