合并分支

chenhaozhe

2025-09-02 c25ec5253f5b0e5b02a41ce0514fb2b30493bdaf

 WebTM/WebTM.csproj

@@ -472,6 +472,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeReport.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Billorigin.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit_Import.html" />
@@ -531,6 +532,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_BilloriginEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePrice.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemMethod_Excel.html" />