Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM

# Conflicts: # NFine.Web/NFine.Web.csproj
no message
1 changed files with 7 additions and 0 deletions
--- a/NFine.Web/NFine.Web.csproj
+++ b/NFine.Web/NFine.Web.csproj
@ -811,8 +811,15 @@
    <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDoc_Supplier.cshtml" />
    <Content Include="Areas\SRM\Views\PriceInquiry\VendorPersAddItem.cshtml" />
    <Content Include="Areas\SRM\Views\RCVList\Index.cshtml" />
+
+
    <Content Include="Areas\PNSRM\Views\CreateItemLot\FormNew.cshtml" />
+
    <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDocByPO.cshtml" />
+
+    <Content Include="Areas\PNSRM\Views\CreateItemLot\FormNew.cshtml" />
+    <Content Include="Areas\PNSRM\Views\BicDoc_Publish\ICSBicDocByPO.cshtml" />
+
    <None Include="Scripts\jquery-1.10.2.intellisense.js" />
    <Content Include="Scripts\jquery-1.10.2.js" />
    <Content Include="Scripts\jquery-1.10.2.min.js" />
Author	SHA1	Message	Date
Jjie	4e5f821e05	Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM # Conflicts: # NFine.Web/NFine.Web.csproj	9 months ago
Jjie	43963468a4	no message	9 months ago