Commit 5ab2c9c0 by 赵剑炜

Merge branch 'master' into develop

# Conflicts:
#	.gitignore
parents 38557d91 879326c1
################################################################################
# .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建
################################################################################
/Junmp.Platform.Common/obj/Debug/net5.0
/Junmp.Platform.Entity/obj/Debug/net5.0
/Junmp.Platform.Repository/obj/Debug/net5.0
/Junmp.Platform.WebApi/obj/Debug/net5.0
/Junmp.Platform.Service/obj/Debug/net5.0
/Junmp.Platform.WebApi/obj
/Junmp.Platform.WebApi/bin/Debug/net5.0/.vs/RuYiAdmin
/.vs
/Junmp.Platform.WebApi/bin/Debug/net7.0
/Junmp.Platform.WebApi/bin/Release/net7.0
/Junmp.Platform.WebApiGateway/bin/Release/net7.0
/Junmp.Platform.ZenithTest/bin/Release/net7.0
/Junmp.Platform.Common/obj/Debug/net7.0/Junmp.Platform.Common.assets.cache
/Junmp.Platform.Common/obj/Debug/net7.0/Junmp.Platform.Common.csproj.AssemblyReference.cache
/Junmp.Platform.Common/obj/Release/net7.0/.NETCoreApp,Version=v7.0.AssemblyAttributes.cs
/Junmp.Platform.Common/obj/Release/net7.0/Junmp.Platform.Common.AssemblyInfo.cs
/Junmp.Platform.Common/obj/Release/net7.0/Junmp.Platform.Common.AssemblyInfoInputs.cache
/Junmp.Platform.Common/obj/Release/net7.0/Junmp.Platform.Common.assets.cache
/Junmp.Platform.Common/obj/Release/net7.0/Junmp.Platform.Common.csproj.AssemblyReference.cache
/Junmp.Platform.Common/obj/Release/net7.0/Junmp.Platform.Common.GeneratedMSBuildEditorConfig.editorconfig
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论