From 21dad2a2c73262cd6787bf78b4806de0b8b20bac Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 29 五月 2025 09:20:53 +0800
Subject: [PATCH] 合并冲突 2025-5-29 9:20
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 4baef78..8409a77 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -129,6 +129,7 @@
}
else if (sCapName == "娣诲悍绉戞妧")
{
+ list.Add("鍞竴鏉＄爜");
list.Add("鎵规鏉＄爜");
}
else
--
Gitblit v1.9.1