From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/Properties/Settings.settings | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/Properties/Settings.settings b/DevApp/Gs.DevApp/Properties/Settings.settings
index a614423..8d0884f 100644
--- a/DevApp/Gs.DevApp/Properties/Settings.settings
+++ b/DevApp/Gs.DevApp/Properties/Settings.settings
@@ -11,14 +11,11 @@
<Setting Name="remember" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
- <Setting Name="orgGuid" Type="System.String" Scope="User">
- <Value Profile="(Default)" />
+ <Setting Name="fontSizeName" Type="System.String" Scope="User">
+ <Value Profile="(Default)">瀹嬩綋,10</Value>
</Setting>
- <Setting Name="fontSize" Type="System.Single" Scope="User">
- <Value Profile="(Default)">10</Value>
- </Setting>
- <Setting Name="fontName" Type="System.String" Scope="User">
- <Value Profile="(Default)">Tahoma</Value>
+ <Setting Name="isWeight" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
--
Gitblit v1.9.3