From b5bc15f6acb8fcc2e259df8f05de596d61cab61c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 09 五月 2022 09:57:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.resx | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
index d78f16d..97c1fc6 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.resx"
@@ -146,51 +146,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAATwBAQE8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAUQBAQFEAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAT4BigH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQ
- AbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/AQkBkAG5Af8BCQGQAbkB/wEJAZABuQH/
- AQkBkAG5Af8DAAn/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/
- AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AwAB/wMAAf+AAAT/
- AQABPgGKAf8B0QH2Av8BUAHaAfQB/wFFAdMB8QH/AToBywHvAf8BMAHEAe0B/wEmAb4B6wH/ARwBuAHo
- Af8BEAGwAecB/wEGAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQkBkAG5Af8DAAn/AQABPgGK
- Af8B0QH2Av8BJQG+AesB/wEfAbkB6QH/ARcBtAHnAf8BDwGwAeYB/wEIAasB5AH/AQEBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQkBkAG5Af8BAAE+AYoB/wMAAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AVYB3gH1
- Af8BSwHWAfMB/wFBAdAB8QH/ATYByQHuAf8BLAHCAewB/wEhAbwB6gH/ARcBtAHnAf8BDAGtAeUB/wEC
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/ATABxQHuAf8BKgHB
- AesB/wEjAbwB6wH/ARsBtwHoAf8BFAGyAecB/wEMAa4B5QH/AQUBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQkBkAG5Af8DAAH/AQABPgGKAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AYEB4QH3Af8BUgHaAfQB/wFH
- AdQB8gH/ATwBzAHvAf8BMgHGAe4B/wEoAcAB6wH/AR0BuQHpAf8BEwGyAeYB/wEIAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/ATUByAHuAf8BLgHEAewB/wEnAb8B6wH/
- ASABuwHqAf8BGQG2AegB/wERAbAB5wH/AQoBrAHlAf8BAwGnAeMB/wEAAaMB4gH/AQABPgGKAf8DAAH/
- AQABPgGKAf8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AYYB5QH3Af8BWAHfAfUB/wFNAdgB8wH/AUMB0QHx
- Af8BOAHKAe8B/wEuAcQB7QH/ASQBvQHqAf8BGQG2AegB/wEOAa8B5QH/AQMBqAHjAf8BAAGiAeEB/wEJ
- AZABuQH/AwAB/wEAAT4BigH/AdEB9gL/AUEBzwHxAf8BOgHLAe8B/wEyAccB7gH/ASwBwgHsAf8BJQG9
- AeoB/wEdAbkB6QH/ARYBtAHnAf8BDwGwAeYB/wEHAaoB5QH/AQkBkAG5Af8DAAH/AQkBkAG5Af8BCQGQ
- AbkB/wMAAf+AAAT/AQABPgGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVQB3AH1Af8BSgHVAfIB/wE+
- Ac4B8AH/ATQByAHuAf8BKgHBAewB/wEgAboB6gH/ARQBswHnAf8BCgGsAeUB/wEAAaYB4wH/AQkBkAG5
- Af8DAAH/AQABPgGKAf8B0QH2Av8BRgHTAfIB/wE+Ac4B8AH/ATcBygHuAf8BMAHFAe0B/wEqAcEB6wH/
- ASIBvAHqAf8BGwG3AegB/wETAbIB5gH/AQwBrgHlAf8BCQGQAbkB/wMAAf8BCQGQAbkB/wEJAZABuQH/
- AwAB/4AABP8BAAE+AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWgHgAfYB/wFQAdkB8wH/AUUB0wHy
- Af8BOgHLAe8B/wEwAcUB7QH/ASYBvgHrAf8BHAG4AekB/wEQAbAB5gH/AQUBqQHkAf8BCQGQAbkB/wMA
- Af8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEA
- AT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BCQGQAbkB/wE3AckB7gH/AQkBkAG5
- Af8DAAH/gAAE/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVcB3gH1Af8BSwHW
- AfMB/wFBAc8B8QH/ATYByQHvAf8BLAHCAewB/wEiAbsB6QH/ARcBtQHnAf8BDAGtAeYB/wEJAZABuQH/
- AwAF/wEAAT4BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFX
- Ad0B9QH/AVEB2gHzAf8BSwHXAfMB/wFGAdMB8QH/AUABzwHxAf8BOgHLAe8B/wEJAZABuQH/AwAB/4AA
- BP8BAAE+AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEJAZABuQH/AwAF/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFaAeAB9gH/AVUB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BCQGQAbkB/wMAAf+AAAT/AQABPgGKAf8BHAGoAdMB/wEcAagB0wH/ARwBqAHTAf8BHAGo
- AdMB/wEcAagB0wH/ARwBqAHTAf8BHAGoAdMB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/
- AQABPgGKAf8BAAE+AYoJ/wEAAT4BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+
- AYoF/4AACP8BAAE+AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT4BigH/AwAh/wEAAT4BigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPgGKHf+AAAz/AQABPgGKAf8BAAE+AYoB/wEA
- AT4BigH/AQABPgGKAf8BAAE+AYoB/wMAKf8BAAE+AYoB/wEAAT4BigH/AQABPgGKAf8BAAE+AYoB/wEA
- AT4BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAAT0BigH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQ
+ AbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/AQgBkAG5Af8BCAGQAbkB/wEIAZABuQH/
+ AQgBkAG5Af8DAAn/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/
+ AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AwAB/wMAAf+AAAT/
+ AQABPQGKAf8B0QH2Av8BTwHaAfQB/wFEAdMB8QH/ATkBywHvAf8BLwHEAe0B/wElAb4B6wH/ARsBuAHo
+ Af8BDwGwAecB/wEFAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQgBkAG5Af8DAAn/AQABPQGK
+ Af8B0QH2Av8BJAG+AesB/wEeAbkB6QH/ARYBtAHnAf8BDgGwAeYB/wEHAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQgBkAG5Af8BAAE9AYoB/wMAAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AVUB3gH1
+ Af8BSgHWAfMB/wFAAdAB8QH/ATUByQHuAf8BKwHCAewB/wEgAbwB6gH/ARYBtAHnAf8BCwGtAeUB/wEB
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/AS8BxQHuAf8BKQHB
+ AesB/wEiAbwB6wH/ARoBtwHoAf8BEwGyAecB/wELAa4B5QH/AQQBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQgBkAG5Af8DAAH/AQABPQGKAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AYEB4QH3Af8BUQHaAfQB/wFG
+ AdQB8gH/ATsBzAHvAf8BMQHGAe4B/wEnAcAB6wH/ARwBuQHpAf8BEgGyAeYB/wEHAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/ATQByAHuAf8BLQHEAewB/wEmAb8B6wH/
+ AR8BuwHqAf8BGAG2AegB/wEQAbAB5wH/AQkBrAHlAf8BAgGnAeMB/wEAAaMB4gH/AQABPQGKAf8DAAH/
+ AQABPQGKAf8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AYYB5QH3Af8BVwHfAfUB/wFMAdgB8wH/AUIB0QHx
+ Af8BNwHKAe8B/wEtAcQB7QH/ASMBvQHqAf8BGAG2AegB/wENAa8B5QH/AQIBqAHjAf8BAAGiAeEB/wEI
+ AZABuQH/AwAB/wEAAT0BigH/AdEB9gL/AUABzwHxAf8BOQHLAe8B/wExAccB7gH/ASsBwgHsAf8BJAG9
+ AeoB/wEcAbkB6QH/ARUBtAHnAf8BDgGwAeYB/wEGAaoB5QH/AQgBkAG5Af8DAAH/AQgBkAG5Af8BCAGQ
+ AbkB/wMAAf+AAAT/AQABPQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVMB3AH1Af8BSQHVAfIB/wE9
+ Ac4B8AH/ATMByAHuAf8BKQHBAewB/wEfAboB6gH/ARMBswHnAf8BCQGsAeUB/wEAAaYB4wH/AQgBkAG5
+ Af8DAAH/AQABPQGKAf8B0QH2Av8BRQHTAfIB/wE9Ac4B8AH/ATYBygHuAf8BLwHFAe0B/wEpAcEB6wH/
+ ASEBvAHqAf8BGgG3AegB/wESAbIB5gH/AQsBrgHlAf8BCAGQAbkB/wMAAf8BCAGQAbkB/wEIAZABuQH/
+ AwAB/4AABP8BAAE9AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BWQHgAfYB/wFPAdkB8wH/AUQB0wHy
+ Af8BOQHLAe8B/wEvAcUB7QH/ASUBvgHrAf8BGwG4AekB/wEPAbAB5gH/AQQBqQHkAf8BCAGQAbkB/wMA
+ Af8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEA
+ AT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BCAGQAbkB/wE2AckB7gH/AQgBkAG5
+ Af8DAAH/gAAE/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVYB3gH1Af8BSgHW
+ AfMB/wFAAc8B8QH/ATUByQHvAf8BKwHCAewB/wEhAbsB6QH/ARYBtQHnAf8BCwGtAeYB/wEIAZABuQH/
+ AwAF/wEAAT0BigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFW
+ Ad0B9QH/AVAB2gHzAf8BSgHXAfMB/wFFAdMB8QH/AT8BzwHxAf8BOQHLAe8B/wEIAZABuQH/AwAB/4AA
+ BP8BAAE9AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEIAZABuQH/AwAF/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFZAeAB9gH/AVQB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BCAGQAbkB/wMAAf+AAAT/AQABPQGKAf8BGwGoAdMB/wEbAagB0wH/ARsBqAHTAf8BGwGo
+ AdMB/wEbAagB0wH/ARsBqAHTAf8BGwGoAdMB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/
+ AQABPQGKAf8BAAE9AYoJ/wEAAT0BigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9
+ AYoF/4AACP8BAAE9AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAT0BigH/AwAh/wEAAT0BigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABPQGKHf+AAAz/AQABPQGKAf8BAAE9AYoB/wEA
+ AT0BigH/AQABPQGKAf8BAAE9AYoB/wMAKf8BAAE9AYoB/wEAAT0BigH/AQABPQGKAf8BAAE9AYoB/wEA
+ AT0BiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--
Gitblit v1.9.1