Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zgq

2021-05-06 2d20861b6fa3178df9c8edcd848c9600eb1cfc79

 WebTM/WebTM.csproj

@@ -70,6 +70,8 @@
    <Content Include="views\CreateControl.js" />
    <Content Include="views\grf\123.txt" />
    <Content Include="views\grf\a.grf" />
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -447,6 +449,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Warehouse.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Employee.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Department.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Source.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason.html" />
@@ -581,6 +585,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>