Teams/sy_hx_pbl_backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# 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
parent e4da25b1ca b72c535054
commit 902f906426
11 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Admin.WebApi/Controllers/CommonController.cs
View File

@@ -53,7 +53,7 @@ namespace DOAN.Admin.WebApi.Controllers
{
var hello = _localizer["hello"].Value;
return Ok($"{hello}看到这里页面说明你已经成功启动了本项目:)\n\n" +
"如果觉得项目有用，打赏作者喝杯咖啡作为奖励\n☛☛http://www.izhaorui.cn/vip\n");
"苏州道安自动化有限公司");
}
/// <summary>

2
DOAN.Admin.WebApi/Controllers/PBL/BillofmaterialsController.cs
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>
/// 物料清单

2
DOAN.Admin.WebApi/Controllers/PBL/StoragelocationController.cs
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>
/// 料架表