Merge branch 'master' into wxw

Administrator

2024-01-31 7b8df9666698422eaa24c780b9e91bb7905282bb

 Wms/WMS.IBLL/IBllAsnServer/IBllLabelBoxNoServer.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using Model.ModelDto.BllAsnDto;
using Model.ModelVm.BllAsnVm;
using WMS.Entity.BllAsnEntity;

@@ -14,6 +15,6 @@
        /// <param name="model">查询条件</param>
        /// <param name="count">数量</param>
        /// <returns>标签箱码信息</returns>
        List<BllLabelBoxNo> GetLabelBoxList(LabelBoxVm model, out int count);
        List<LabelBoxDto> GetLabelBoxList(LabelBoxVm model, out int count);
    }
}