From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Controllers/CellWidthController.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CellWidthController.cs b/WebAPI/Controllers/CellWidthController.cs
index d91b945..c0d4be6 100644
--- a/WebAPI/Controllers/CellWidthController.cs
+++ b/WebAPI/Controllers/CellWidthController.cs
@@ -15,7 +15,8 @@
{
public class CellWidthController : ApiController
{
- private json objJsonResult = new json();
+
+ private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
--
Gitblit v1.9.1