From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
index d91432e..acfefde 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -53,6 +53,7 @@
         soleQRCode:false,//娴佺▼鍗″悎骞朵簩缁寸爜鏄剧ず鍗曞眰锛屼箟涔宼rue.鍏跺畠false
         reportTime:"08:00",//娆$牬銆佷骇閲忔姤琛ㄩ粯璁ゆ椂闂�
         processFontSize:false,//娴佺▼鍗″姞宸ヨ姹傚瓧浣撳姞澶�
+        printReplenishMerge:true,//琛ョ墖娴佺▼鍗℃墦鍗版槸鍚﹀悓娴佺▼鍗″悎骞�
         //澶╂触
         printLabel: {
             custom: (item1) => {

--
Gitblit v1.8.0