Merge branch 'YanShi' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into YanShi
# Conflicts: # Reportapi/MyCode.Project.Domain/App.config # Reportapi/MyCode.Project.GenerateCode/App.config # Reportapi/MyCode.Project.OutSideService/app.config # Reportapi/MyCode.Project.ScheduleTask/App.config # Reportapi/MyCode.Project.WebApi/Web.config # Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>SqlSugar</RootNamespace>
|
||||
<AssemblyName>SqlSugar</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
Reference in New Issue
Block a user