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

yangle

2022-11-25 46b386cafba2ad5a568cd74bd14615510425da70

 WebTM/WebTM.csproj

@@ -111,7 +111,10 @@
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_UnitGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WHList.html" />
@@ -188,7 +191,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnit_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameter_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProc.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkStationList.html" />
@@ -840,6 +843,7 @@
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />