Merge branch 'YanShi' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into YanShi
# Conflicts: # Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MyCode.Project.Repositories</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.Repositories</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
@@ -86,6 +86,7 @@
|
||||
<Compile Include="Common\Repository`.cs" />
|
||||
<Compile Include="Common\TransactionCallHandler.cs" />
|
||||
<Compile Include="Common\TransactionCallHandlerAttribute.cs" />
|
||||
<Compile Include="MOOrdersRepository.cs" />
|
||||
<Compile Include="JackOrdersRepository.cs" />
|
||||
<Compile Include="Lxm\LxmReportRepository.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
|
||||
Reference in New Issue
Block a user