From 16bb2f7b48cf2c3cfbb6a026c265d4e52d22eca4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 29 十月 2022 17:11:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/公用基础资料/Gy_FactoryDayOff.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\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
index cf035ac..a437790 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_FactoryDayOff.resx"
@@ -412,51 +412,51 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAASQBAQEkAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAASwBAQEsAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAAUEBigH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQ
- AbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/AQwBkAG5Af8BDAGQAbkB/wEMAZABuQH/
- AQwBkAG5Af8DAAn/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AwAB/wMAAf+AAAT/
- AQABQQGKAf8B0QH2Av8BUwHaAfQB/wFIAdMB8QH/AT0BywHvAf8BMwHEAe0B/wEpAb4B6wH/AR8BuAHo
- Af8BEwGwAecB/wEJAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQwBkAG5Af8DAAn/AQABQQGK
- Af8B0QH2Av8BKAG+AesB/wEiAbkB6QH/ARoBtAHnAf8BEgGwAeYB/wELAasB5AH/AQQBpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQwBkAG5Af8BAAFBAYoB/wMAAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AVkB3gH1
- Af8BTgHWAfMB/wFEAdAB8QH/ATkByQHuAf8BLwHCAewB/wEkAbwB6gH/ARoBtAHnAf8BDwGtAeUB/wEF
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATMBxQHuAf8BLQHB
- AesB/wEmAbwB6wH/AR4BtwHoAf8BFwGyAecB/wEPAa4B5QH/AQgBqQHkAf8BAQGlAeIB/wEAAaEB4QH/
- AQwBkAG5Af8DAAH/AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYEB4QH3Af8BVQHaAfQB/wFK
- AdQB8gH/AT8BzAHvAf8BNQHGAe4B/wErAcAB6wH/ASABuQHpAf8BFgGyAeYB/wELAasB5QH/AQEBpQHi
- Af8BAAGfAeEB/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/ATgByAHuAf8BMQHEAewB/wEqAb8B6wH/
- ASMBuwHqAf8BHAG2AegB/wEUAbAB5wH/AQ0BrAHlAf8BBgGnAeMB/wEAAaMB4gH/AQABQQGKAf8DAAH/
- AQABQQGKAf8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AYYB5QH3Af8BWwHfAfUB/wFQAdgB8wH/AUYB0QHx
- Af8BOwHKAe8B/wExAcQB7QH/AScBvQHqAf8BHAG2AegB/wERAa8B5QH/AQYBqAHjAf8BAAGiAeEB/wEM
- AZABuQH/AwAB/wEAAUEBigH/AdEB9gL/AUQBzwHxAf8BPQHLAe8B/wE1AccB7gH/AS8BwgHsAf8BKAG9
- AeoB/wEgAbkB6QH/ARkBtAHnAf8BEgGwAeYB/wEKAaoB5QH/AQwBkAG5Af8DAAH/AQwBkAG5Af8BDAGQ
- AbkB/wMAAf+AAAT/AQABQQGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVcB3AH1Af8BTQHVAfIB/wFB
- Ac4B8AH/ATcByAHuAf8BLQHBAewB/wEjAboB6gH/ARcBswHnAf8BDQGsAeUB/wEDAaYB4wH/AQwBkAG5
- Af8DAAH/AQABQQGKAf8B0QH2Av8BSQHTAfIB/wFBAc4B8AH/AToBygHuAf8BMwHFAe0B/wEtAcEB6wH/
- ASUBvAHqAf8BHgG3AegB/wEWAbIB5gH/AQ8BrgHlAf8BDAGQAbkB/wMAAf8BDAGQAbkB/wEMAZABuQH/
- AwAB/4AABP8BAAFBAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXQHgAfYB/wFTAdkB8wH/AUgB0wHy
- Af8BPQHLAe8B/wEzAcUB7QH/ASkBvgHrAf8BHwG4AekB/wETAbAB5gH/AQgBqQHkAf8BDAGQAbkB/wMA
- Af8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BDAGQAbkB/wE6AckB7gH/AQwBkAG5
- Af8DAAH/gAAE/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVoB3gH1Af8BTgHW
- AfMB/wFEAc8B8QH/ATkByQHvAf8BLwHCAewB/wElAbsB6QH/ARoBtQHnAf8BDwGtAeYB/wEMAZABuQH/
- AwAF/wEAAUEBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFa
- Ad0B9QH/AVQB2gHzAf8BTgHXAfMB/wFJAdMB8QH/AUMBzwHxAf8BPQHLAe8B/wEMAZABuQH/AwAB/4AA
- BP8BAAFBAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEMAZABuQH/AwAF/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFdAeAB9gH/AVgB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BDAGQAbkB/wMAAf+AAAT/AQABQQGKAf8BHwGoAdMB/wEfAagB0wH/AR8BqAHTAf8BHwGo
- AdMB/wEfAagB0wH/AR8BqAHTAf8BHwGoAdMB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/
- AQABQQGKAf8BAAFBAYoJ/wEAAUEBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFB
- AYoF/4AACP8BAAFBAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUEBigH/AwAh/wEAAUEBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQQGKHf+AAAz/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBigH/AQABQQGKAf8BAAFBAYoB/wMAKf8BAAFBAYoB/wEAAUEBigH/AQABQQGKAf8BAAFBAYoB/wEA
- AUEBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAAUABigH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/AQsBkAG5Af8BCwGQ
+ AbkB/wELAZABuQH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/AQsBkAG5Af8BCwGQAbkB/wELAZABuQH/
+ AQsBkAG5Af8DAAn/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/
+ AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AwAB/wMAAf+AAAT/
+ AQABQAGKAf8B0QH2Av8BUgHaAfQB/wFHAdMB8QH/ATwBywHvAf8BMgHEAe0B/wEoAb4B6wH/AR4BuAHo
+ Af8BEgGwAecB/wEIAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQsBkAG5Af8DAAn/AQABQAGK
+ Af8B0QH2Av8BJwG+AesB/wEhAbkB6QH/ARkBtAHnAf8BEQGwAeYB/wEKAasB5AH/AQMBpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQsBkAG5Af8BAAFAAYoB/wMAAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AVgB3gH1
+ Af8BTQHWAfMB/wFDAdAB8QH/ATgByQHuAf8BLgHCAewB/wEjAbwB6gH/ARkBtAHnAf8BDgGtAeUB/wEE
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/ATIBxQHuAf8BLAHB
+ AesB/wElAbwB6wH/AR0BtwHoAf8BFgGyAecB/wEOAa4B5QH/AQcBqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQsBkAG5Af8DAAH/AQABQAGKAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AYEB4QH3Af8BVAHaAfQB/wFJ
+ AdQB8gH/AT4BzAHvAf8BNAHGAe4B/wEqAcAB6wH/AR8BuQHpAf8BFQGyAeYB/wEKAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/ATcByAHuAf8BMAHEAewB/wEpAb8B6wH/
+ ASIBuwHqAf8BGwG2AegB/wETAbAB5wH/AQwBrAHlAf8BBQGnAeMB/wEAAaMB4gH/AQABQAGKAf8DAAH/
+ AQABQAGKAf8DAAH/gAAE/wEAAUABigH/AdEB9gL/AYYB5QH3Af8BWgHfAfUB/wFPAdgB8wH/AUUB0QHx
+ Af8BOgHKAe8B/wEwAcQB7QH/ASYBvQHqAf8BGwG2AegB/wEQAa8B5QH/AQUBqAHjAf8BAAGiAeEB/wEL
+ AZABuQH/AwAB/wEAAUABigH/AdEB9gL/AUMBzwHxAf8BPAHLAe8B/wE0AccB7gH/AS4BwgHsAf8BJwG9
+ AeoB/wEfAbkB6QH/ARgBtAHnAf8BEQGwAeYB/wEJAaoB5QH/AQsBkAG5Af8DAAH/AQsBkAG5Af8BCwGQ
+ AbkB/wMAAf+AAAT/AQABQAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AVYB3AH1Af8BTAHVAfIB/wFA
+ Ac4B8AH/ATYByAHuAf8BLAHBAewB/wEiAboB6gH/ARYBswHnAf8BDAGsAeUB/wECAaYB4wH/AQsBkAG5
+ Af8DAAH/AQABQAGKAf8B0QH2Av8BSAHTAfIB/wFAAc4B8AH/ATkBygHuAf8BMgHFAe0B/wEsAcEB6wH/
+ ASQBvAHqAf8BHQG3AegB/wEVAbIB5gH/AQ4BrgHlAf8BCwGQAbkB/wMAAf8BCwGQAbkB/wELAZABuQH/
+ AwAB/4AABP8BAAFAAYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BXAHgAfYB/wFSAdkB8wH/AUcB0wHy
+ Af8BPAHLAe8B/wEyAcUB7QH/ASgBvgHrAf8BHgG4AekB/wESAbAB5gH/AQcBqQHkAf8BCwGQAbkB/wMA
+ Af8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEA
+ AUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BCwGQAbkB/wE5AckB7gH/AQsBkAG5
+ Af8DAAH/gAAE/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVkB3gH1Af8BTQHW
+ AfMB/wFDAc8B8QH/ATgByQHvAf8BLgHCAewB/wEkAbsB6QH/ARkBtQHnAf8BDgGtAeYB/wELAZABuQH/
+ AwAF/wEAAUABigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgAHhAfcB/wFZ
+ Ad0B9QH/AVMB2gHzAf8BTQHXAfMB/wFIAdMB8QH/AUIBzwHxAf8BPAHLAe8B/wELAZABuQH/AwAB/4AA
+ BP8BAAFAAYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wELAZABuQH/AwAF/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFcAeAB9gH/AVcB3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BCwGQAbkB/wMAAf+AAAT/AQABQAGKAf8BHgGoAdMB/wEeAagB0wH/AR4BqAHTAf8BHgGo
+ AdMB/wEeAagB0wH/AR4BqAHTAf8BHgGoAdMB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/
+ AQABQAGKAf8BAAFAAYoJ/wEAAUABigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFA
+ AYoF/4AACP8BAAFAAYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAAUABigH/AwAh/wEAAUABigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABQAGKHf+AAAz/AQABQAGKAf8BAAFAAYoB/wEA
+ AUABigH/AQABQAGKAf8BAAFAAYoB/wMAKf8BAAFAAYoB/wEAAUABigH/AQABQAGKAf8BAAFAAYoB/wEA
+ AUABiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
</value>
</data>
<metadata name="stTab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
--
Gitblit v1.9.1