From 06e105234f820a2e791cac3e6c7012cc8bf4d905 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 06 五月 2026 17:10:06 +0800
Subject: [PATCH] ZPL 打印模板 新增自动换行功能

---
 WebAPI/App_Start/WebApiConfig.cs |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/WebAPI/App_Start/WebApiConfig.cs b/WebAPI/App_Start/WebApiConfig.cs
index 2d52a8a..d325d60 100644
--- a/WebAPI/App_Start/WebApiConfig.cs
+++ b/WebAPI/App_Start/WebApiConfig.cs
@@ -31,21 +31,13 @@
                 defaults: new { id = RouteParameter.Optional }
             );
             // 娉ㄥ唽绛惧悕
-<<<<<<< HEAD
             //config.Filters.Add(new SignatureVerifyAttribute());
             //// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
             //config.Filters.Add(new JwtAuthorizeAttribute());
 
             //// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
             //config.MessageHandlers.Add(new TokenAppendHandler());
-=======
-            // config.Filters.Add(new SignatureVerifyAttribute());
-            //// 鍏ㄥ眬鍚敤 JWT 璁よ瘉
-            // config.Filters.Add(new JwtAuthorizeAttribute());
 
-            //// 鍚敤JWT鍝嶅簲鎷︽埅鍣紝鑷姩鍒锋柊JWT
-            // config.MessageHandlers.Add(new TokenAppendHandler());
->>>>>>> ce72deb4068917547d97c3e8991dde8772728d25
         }
     }
 }

--
Gitblit v1.9.1