冲突解决

WYB

2021-03-26 8d7134c8d37e08b1a737a02e6abca807d6220774

 WebTM/WebTM.csproj

@@ -63,7 +63,7 @@
    <Content Include="layuiadmin\layui\font\iconfont.eot" />
    <Content Include="layuiadmin\layui\font\iconfont.ttf" />
    <Content Include="layuiadmin\layui\font\iconfont.woff" />
    <None Include="Properties\PublishProfiles\LAYUI.pubxml" />
    <None Include="Properties\PublishProfiles\JFTM.pubxml" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -207,9 +207,7 @@
    <Content Include="layuiadmin\layui\images\face\8.gif" />
    <Content Include="layuiadmin\layui\images\face\9.gif" />
    <Content Include="layuiadmin\layui\layui.all.js" />
    <Content Include="layuiadmin\layui\layui.js">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\lay\all-mobile.js" />
    <Content Include="layuiadmin\layui\lay\all.js" />
    <Content Include="layuiadmin\layui\lay\modules\carousel.js" />
@@ -260,8 +258,12 @@
    <Content Include="layuiadmin\Scripts\jquery-3.5.1.min.js" />
    <Content Include="layuiadmin\Scripts\json2.js" />
    <Content Include="layuiadmin\Scripts\webConfig.js" />
    <Content Include="layuiadmin\style\admin.css" />
    <Content Include="layuiadmin\style\login.css" />
    <Content Include="layuiadmin\style\admin.css">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="layuiadmin\style\login.css">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="layuiadmin\style\res\bg-none.jpg" />
    <Content Include="layuiadmin\style\res\layui-logo.jpg" />
    <Content Include="layuiadmin\style\res\logo-black.png" />
@@ -433,14 +435,10 @@
    <Content Include="views\基础资料\生产基础资料\Gy_Process.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessList.html" />
    <Content Include="views\生产工序管理\委外工单\WW_EntrustWorkOrderBillMainList.html" />
    <Content Include="views\生产工序管理\委外工序汇报单\Sc_StationOutBillMainList.html" />
    <Content Include="views\生产工序管理\工序汇报单\Sc_ProcessReportList.html" />
    <Content Include="views\生产工序管理\工序派工单\Sc_ProcessSendWorkList.html" />
    <Content Include="views\生产工序管理\工序计划单\Sc_ProcessPlanList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillList.html" />
    <Content Include="views\组装单\Sc_AssemblyBill_Fast.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList.html" />
    <Content Include="views\车间管理\不良品评审单\Cj_NoPassProcList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA.html" />