From 7651c2708a69d1f1573d0542a88d91007483e522 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 23 十二月 2021 15:39:04 +0800
Subject: [PATCH] nothing代码冲突解决
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 24831dd..8a045aa 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -722,7 +722,7 @@
ListModels oListModels = new ListModels();
try
{
- WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>();
ls = oListModels.getObjectByJson_Report(msg1);
int i = 0;
@@ -924,7 +924,7 @@
ListModels oListModels = new ListModels();
try
{
- WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
List<Model.ClsSc_ProcessReportMain> lsmain = new List<Model.ClsSc_ProcessReportMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
--
Gitblit v1.9.1