From 8d7134c8d37e08b1a737a02e6abca807d6220774 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期五, 26 三月 2021 17:33:06 +0800
Subject: [PATCH] 冲突解决
---
WebTM/WebTM.csproj | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8b8d6a3..8e95209 100644
--- a/WebTM/WebTM.csproj
+++ b/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" />
--
Gitblit v1.9.1