1
This commit is contained in:
@@ -115,25 +115,22 @@
|
|||||||
<Compile Include="BLL\WebSocketBLL.cs" />
|
<Compile Include="BLL\WebSocketBLL.cs" />
|
||||||
<Compile Include="Implementation\AnsyDataProcessService.cs" />
|
<Compile Include="Implementation\AnsyDataProcessService.cs" />
|
||||||
<Compile Include="Implementation\ApiLogService.cs" />
|
<Compile Include="Implementation\ApiLogService.cs" />
|
||||||
<<<<<<< HEAD
|
|
||||||
<Compile Include="Implementation\ZhuBinService.cs" />
|
|
||||||
<Compile Include="Implementation\PurOrderService.cs" />
|
<Compile Include="Implementation\PurOrderService.cs" />
|
||||||
=======
|
|
||||||
<Compile Include="Implementation\PrdOrderService.cs" />
|
<Compile Include="Implementation\PrdOrderService.cs" />
|
||||||
<Compile Include="Implementation\LiQiongHaiService.cs" />
|
|
||||||
>>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
|
|
||||||
<Compile Include="Implementation\YuyuboService.cs" />
|
<Compile Include="Implementation\YuyuboService.cs" />
|
||||||
<Compile Include="Implementation\ReportService.cs" />
|
<Compile Include="Implementation\ReportService.cs" />
|
||||||
<Compile Include="Implementation\QueueProcessService.cs" />
|
<Compile Include="Implementation\QueueProcessService.cs" />
|
||||||
<Compile Include="Implementation\WebSocketService.cs" />
|
<Compile Include="Implementation\WebSocketService.cs" />
|
||||||
<Compile Include="IServices\IAnsyDataProcessService.cs" />
|
<Compile Include="IServices\IAnsyDataProcessService.cs" />
|
||||||
<<<<<<< HEAD
|
|
||||||
<Compile Include="IServices\IPurOrderService.cs" />
|
<Compile Include="IServices\IPurOrderService.cs" />
|
||||||
<Compile Include="IServices\IZhuBinService.cs" />
|
|
||||||
=======
|
|
||||||
<Compile Include="IServices\ILiQiongHaiService.cs" />
|
|
||||||
<Compile Include="IServices\IPrdOrderService.cs" />
|
<Compile Include="IServices\IPrdOrderService.cs" />
|
||||||
>>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
|
|
||||||
<Compile Include="IServices\IYuyuboService.cs" />
|
<Compile Include="IServices\IYuyuboService.cs" />
|
||||||
<Compile Include="IServices\IApiLogService.cs" />
|
<Compile Include="IServices\IApiLogService.cs" />
|
||||||
<Compile Include="IServices\IItemListService.cs" />
|
<Compile Include="IServices\IItemListService.cs" />
|
||||||
|
|||||||
Reference in New Issue
Block a user