合并代码

This commit is contained in:
ChenYi 2025-06-04 17:13:56 +08:00
commit 375b111d65
7 changed files with 32 additions and 21 deletions

View File

@ -6,22 +6,24 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\JiShe.IoT.Domain.Shared\JiShe.IoT.Domain.Shared.csproj"/>
<ProjectReference Include="..\JiShe.IoT.Domain.Shared\JiShe.IoT.Domain.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.ObjectExtending"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />
<PackageReference Include="Volo.Abp.ObjectExtending" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application.Contracts"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts"/>
</ItemGroup>
</Project>

View File

@ -13,6 +13,7 @@
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application" />
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" />
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application" />
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" />
@ -20,7 +21,8 @@
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application" />
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FileManagement.Application" />
<PackageReference Include="JiShe.ServicePro.FreeRedisProvider" />
<PackageReference Include="JiShe.ServicePro.FreeRedisProvider" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />
</ItemGroup>
<ItemGroup>

View File

@ -22,6 +22,7 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain.Shared"/>
<PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain.Shared" />
</ItemGroup>
</Project>

View File

@ -18,6 +18,8 @@
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain" />
</ItemGroup>
</Project>

View File

@ -18,6 +18,7 @@
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.EntityFrameworkCore"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore"/>
</ItemGroup>
<ItemGroup>
@ -26,4 +27,4 @@
<PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>
</Project>

View File

@ -17,6 +17,7 @@
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi.Client"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi.Client"/>
</ItemGroup>

View File

@ -13,15 +13,17 @@
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.LanguageManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.TemplateManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi" />
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi" />
<ItemGroup>
<PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.LanguageManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.TemplateManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi"/>
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi" />
</ItemGroup>
</ItemGroup>
</Project>