Merge remote-tracking branch 'origin/master'

# Conflicts:
#	DOAN.Admin.WebApi/Controllers/PBL/MESInteractionController.cs
#	DOAN.Service/PBL/MESInteractionServcie.cs
#	Infrastructure/DOAN.Infrastructure.csproj
This commit is contained in:
qianhao.xu
2024-11-01 11:36:08 +08:00
11 changed files with 36 additions and 16 deletions

View File

@@ -5,7 +5,7 @@ using DOAN.Service.PBL.IService;
using DOAN.Admin.WebApi.Filters;
//创建时间2024-09-23
namespace DOAN.Admin.WebApi.Controllers.Business
namespace DOAN.Admin.WebApi.Controllers.PBL
{
/// <summary>
/// 物料清单

View File

@@ -5,7 +5,7 @@ using DOAN.Service.PBL.IService;
using DOAN.Admin.WebApi.Filters;
//创建时间2024-09-23
namespace DOAN.Admin.WebApi.Controllers.Business
namespace DOAN.Admin.WebApi.Controllers.PBL
{
/// <summary>
/// 料架表