From 33583f8a9716e4313163fb9bbde58fea02012a28 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 08 九月 2025 14:28:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 113 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index ef3b42f..a2e9e79 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -311,6 +311,119 @@
         AABJRU5ErkJggg==
 </value>
   </data>
+  <data name="btnPingZhi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFN0YWNrZWRCYXIzRDszRDsQhC4B
+        AAACTElEQVQ4T23Sy09TQRQG8PlzfC3cqXtduDICmqhEtInRqIhg0SAFBBHBWIuIQRuBYlFjeEiioWJ5
+        iVQTQI0mSOJGV5QiLX3Q3kfv7eeZU3qh4uLXSe8983XSb0R779cxggde6Qtre5rzGfd7slo90hxc3XO4
+        1zXLnJ0zY6Kp4yMyQBZ9WOsWmXWAyTKob/sA0fgwwA8V1UBKTRMDSV7TvCb5e/bZmrLBpJS61imIm+3T
+        HCAHfr5/ifHmIozdLsTorQLUtPTgqjtgSaR0i0EBta5JCHkMeRyZ2ntmD8ylbpihLsz/DmBgYYU5vHM4
+        WNqPeFLPSmkwDBPVzgmIWtcUHyeRSqO7eDfCfhtmW/bhrOcb65kJ8mYpmtQQW9MQXdOhU0DVnXGIGuck
+        H0cmu4/ugvvITjwu2mFtynky9J02alhNUADR0yauNY9CXL87gbSRQYwCZLIc4sHcSsNSJCeepekGKpv8
+        EDJFozQeohdhHlBZmKzE/qVgJapwS+UNIxB2SlF1E2F6+WP8RV4L/sbDeNdwCI5mT14byxSQVHSU3fDl
+        B2xuwVwiwU7M/5re0kZeQEXjCBTNoGOpVguLz/dj8dmB/7ax95gby6spvguldcMQ5fVv+RL9odTNLTwq
+        3I6Ogm15TcjNLu8nhCIpxOkPv+B4A1FW5+NLFFpV+MVmSxGFyHVDMCwluaHz1RRwsXaYL5F1y4isNEa/
+        IOVqZVyput6YinNVryFslUM+m30Ip+2vcIqUXBlEScUgTpYPsOLL/ZYTZTl9OH5J6vP9BTA7SFAVdssX
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnPingZhi.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        AAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnFPingZhi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAZdEVYdFRpdGxlAFN0YWNrZWRDb2x1bW4zRDszRDvW
+        itYeAAACs0lEQVQ4T2XS20sUURwH8PkbIrqgyBppIZuSCUUvGYQ9FD34kKCZZklSXtK08H7bpETH1bw9
+        2Opm1oN5AS+r5WWxG5S2LwlRQRlFXnLvOzszO7vfzjnrbEkPn5nhzI/v+XF+h2t/ZJklcL+fes+0PVQt
+        Ma3GJej7qEW09C6CN7xjmh+8neUaul4jAASRR+j9n8AWwM8EUNv2Apyu4xVb9IoKBNFHKPCwt4+9g4Jr
+        bu9ffpJSrV8AV9/+kgWECslPlVo8vPgTV40WJvHWCFyCDIUEVLWYwdE2aDvBYnlL8JsWUud5M+a/umC0
+        WHE8dwBOQYKi+FHePA+uqmWBteMStu905EofnB6ZOdfwDBOfHUjuXkb8ZQPsbhkyCShtnANX2Wxm7dDC
+        s7opfLFKmCO7aVM74XBLTFLFGIaW7UjiLdCmdcHukiD7/Lh9dwZcWdM8fEoADhJwqnQUE5+cSDd8RFQy
+        T3aSmDf6HAjL3fjeehgj+adhdUqQZAUlDc+3B0xnn4Hb0ogVfTx6Eg6EAhbuZZKADhIQh8fZJ7YH0DYk
+        0o6NtDWRchKupTv4xsejWxuJTafIzNSkQPjQRta1MKYfxW+7l425sG4aXDFJEWU/Nh0insRE4EdNHuZi
+        I9EavpMVUuOJCVhv18Ecq0FnVDjWyZqHTKmgxgSuSDcNr6SQQhH90WFYKcvB7CENmvbuwAZZo4aOabHK
+        V2LmYBj4iF1YtwlsvHnVk+AKa6fYJdogqYZ9e9ATSWh2w1RbhzWblxmI2w9jjAa90eEw1ddjzSrASUZ5
+        vWIcXEG1iV0cVkx+/GvV6t1Cv4N+bVIedrjXyklAbtUku0TqpaHoRBxkB5U6DTp/m0tkB24lh5tTOgYu
+        q2TUlFU8ikvFI8gkMm4OI6NoGBcLh0Iu3HjKpBWoBpGaTw2a/gBu+TxKuR3xJAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnFPingZhi.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
   <data name="btnGongZi.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

--
Gitblit v1.9.3