合并代码
This commit is contained in:
commit
375b111d65
@ -6,22 +6,24 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<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>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Volo.Abp.ObjectExtending"/>
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts" />
|
||||||
|
<PackageReference Include="Volo.Abp.ObjectExtending" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.TemplateManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.FileManagement.Application.Contracts" />
|
||||||
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application.Contracts"/>
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application.Contracts"/>
|
||||||
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application.Contracts"/>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application" />
|
<PackageReference Include="JiShe.ServicePro.BasicManagement.Application" />
|
||||||
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Application" />
|
||||||
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" />
|
<PackageReference Include="JiShe.ServicePro.NotificationManagement.Application" />
|
||||||
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application" />
|
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.Application" />
|
||||||
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" />
|
<PackageReference Include="JiShe.ServicePro.LanguageManagement.Application" />
|
||||||
@ -21,6 +22,7 @@
|
|||||||
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application" />
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Application" />
|
||||||
<PackageReference Include="JiShe.ServicePro.FileManagement.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>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -23,5 +23,6 @@
|
|||||||
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain.Shared"/>
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain.Shared"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
|
<PackageReference Include="JiShe.ServicePro.FreeSqlProvider" />
|
||||||
|
|
||||||
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain.Shared" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -18,6 +18,8 @@
|
|||||||
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain"/>
|
<PackageReference Include="JiShe.ServicePro.FileManagement.Domain"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain"/>
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.Domain"/>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" />
|
||||||
|
|
||||||
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.Domain" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@ -18,6 +18,7 @@
|
|||||||
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore"/>
|
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.FileManagement.EntityFrameworkCore"/>
|
<PackageReference Include="JiShe.ServicePro.FileManagement.EntityFrameworkCore"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.EntityFrameworkCore"/>
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.EntityFrameworkCore"/>
|
||||||
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.EntityFrameworkCore"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client"/>
|
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi.Client"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi.Client"/>
|
<PackageReference Include="JiShe.ServicePro.FileManagement.HttpApi.Client"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi.Client"/>
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi.Client"/>
|
||||||
|
<PackageReference Include="JiShe.ServicePro.DeviceManagement.HttpApi.Client"/>
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@ -13,14 +13,16 @@
|
|||||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
|
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi" />
|
<ItemGroup>
|
||||||
<PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi" />
|
<PackageReference Include="JiShe.ServicePro.BasicManagement.HttpApi"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.HttpApi" />
|
<PackageReference Include="JiShe.ServicePro.NotificationManagement.HttpApi"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.LanguageManagement.HttpApi" />
|
<PackageReference Include="JiShe.ServicePro.DataDictionaryManagement.HttpApi"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.TemplateManagement.HttpApi" />
|
<PackageReference Include="JiShe.ServicePro.LanguageManagement.HttpApi"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.DynamicMenuManagement.HttpApi" />
|
<PackageReference Include="JiShe.ServicePro.TemplateManagement.HttpApi"/>
|
||||||
<PackageReference Include="JiShe.ServicePro.FileManagement.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" />
|
<PackageReference Include="JiShe.ServicePro.IoTDBManagement.HttpApi" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user