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.Domain</RootNamespace>
|
||||
<AssemblyName>MyCode.Project.Domain</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
@@ -68,6 +68,8 @@
|
||||
<Compile Include="Message\Response\Common\IdName.cs" />
|
||||
<Compile Include="Message\Response\Common\ItemResult.cs" />
|
||||
<Compile Include="Message\Response\Common\ListHeadFieldData.cs" />
|
||||
<Compile Include="Message\Response\LxmZHMDReport\PrdMoOrderEntryResp.cs" />
|
||||
<Compile Include="Message\Response\LxmZHMDReport\PrdMoOrderResp.cs" />
|
||||
<Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
|
||||
<Compile Include="Message\Response\LxmZHMDReport\SalOrderResp.cs" />
|
||||
<Compile Include="Message\Response\PurOrder\PurOrderMainResp.cs" />
|
||||
@@ -81,11 +83,23 @@
|
||||
<Compile Include="Message\Response\WorkProcess\WorkProcessResp.cs" />
|
||||
<Compile Include="Model\ApiLog.cs" />
|
||||
<Compile Include="Model\JackOrders.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MO.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY_A.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY_C.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY_D.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY_L.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY_LK.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOENTRY_Q.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOSCHEDULEDETAIL.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MOSNDETAIL.cs" />
|
||||
<Compile Include="Model\PrdMo\T_PRD_MO_L.cs" />
|
||||
<Compile Include="Model\PushKingDeeOrder.cs" />
|
||||
<Compile Include="Model\SysWorkprocessHistory.cs" />
|
||||
<Compile Include="Model\YTKJTShopParameter.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Repositories\IApiLogRepository.cs" />
|
||||
<Compile Include="Repositories\IMOOrdersRepository.cs" />
|
||||
<Compile Include="Repositories\IJackOrdersRepository.cs" />
|
||||
<Compile Include="Repositories\IPurOrderRepository.cs" />
|
||||
<Compile Include="Repositories\IRepository.cs" />
|
||||
|
||||
Reference in New Issue
Block a user