代码合并

jingh

2021-08-06 91c049b47497db9d512fc356b52a50a7af617cd2

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183

ÿÿÿÿ
^Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
!Microsoft.Build.Tasks.SystemState
    fileStateSystem.Collections.Hashtable    System.Collections.Hashtable
LoadFactorVersionKeyComparerHashSizeKeysValuesSystem.OrdinalComparerìQ8?            System.OrdinalComparer
_ignoreCase

AD:\GIT源代码\ZY-LMESWEBAPI\SQLHelper\bin\Release\SQLHelper.dllAD:\GIT源代码\ZY-LMESWEBAPI\Pub_Class\bin\Release\Pub_Class.dll    9D:\GIT源代码\ZY-LMESWEBAPI\Model\bin\Release\Model.dll
ED:\GIT源代码\ZY-LMESWEBAPI\Pub_Control\bin\Release\Pub_Control.dllAD:\GIT源代码\ZY-LMESWEBAPI\DBUtility\bin\Release\DBUtility.dll                     +Microsoft.Build.Tasks.SystemState+FileStatemodmodkandepssfilesrtverfn
    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
4’h=FÒ
            
v2.0.50727
 è'!=FÒ
            
v2.0.50727
R\FFÒ
            
v2.0.50727
„9œAFÒ
             
v2.0.50727
Ÿ¢ôBFÒ
    !    "    #$
v2.0.50727,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped



System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



%    SQLHelper
    &    '

Øÿÿÿ5System.Configuration.Assemblies.AssemblyHashAlgorithm
value__€×ÿÿÿ<System.Configuration.Assemblies.AssemblyVersionCompatibility
value__
*Ifile:///D:/GIT源代码/ZY-LMESWEBAPI/SQLHelper/bin/Release/SQLHelper.dll
+@SQLHelper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null

,Microsoft.Build.Shared.AssemblyNameExtension    ,    -    .    /

0    Pub_Class
    1    2


ÍÿÿÿØÿÿÿ€
Ìÿÿÿ×ÿÿÿ
5Ifile:///D:/GIT源代码/ZY-LMESWEBAPI/Pub_Class/bin/Release/Pub_Class.dll
6@Pub_Class, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null

,Microsoft.Build.Shared.AssemblyNameExtension    7    8    9    :    ;

<Model
    =    >


ÁÿÿÿØÿÿÿ€
Àÿÿÿ×ÿÿÿ
AAfile:///D:/GIT源代码/ZY-LMESWEBAPI/Model/bin/Release/Model.dll
B<Model, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null

,Microsoft.Build.Shared.AssemblyNameExtension    C    D

EPub_Control
    F    G


¸ÿÿÿØÿÿÿ€
·ÿÿÿ×ÿÿÿ
JMfile:///D:/GIT源代码/ZY-LMESWEBAPI/Pub_Control/bin/Release/Pub_Control.dll
KIPub_Control, Version=1.0.5584.18016, Culture=neutral, PublicKeyToken=null

,Microsoft.Build.Shared.AssemblyNameExtension    L    M    N    O    P    Q
!
R    DBUtility
    S    T


«ÿÿÿØÿÿÿ€
ªÿÿÿ×ÿÿÿ
WIfile:///D:/GIT源代码/ZY-LMESWEBAPI/DBUtility/bin/Release/DBUtility.dll
X@DBUtility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
"
    ,Microsoft.Build.Shared.AssemblyNameExtension    Y    Z    [    \    ]    ^    _    `    a#&'System.Version_Major_Minor_Build    _Revision
,,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



bmscorlib
    c    d

›ÿÿÿØÿÿÿ
šÿÿÿ×ÿÿÿ

 
 
 
-,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



g    Pub_Class
    h    i

–ÿÿÿØÿÿÿ
•ÿÿÿ×ÿÿÿ

 
 
 
.,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



lSystem.Data
    m    n

‘ÿÿÿØÿÿÿ
ÿÿÿ×ÿÿÿ

 
 
 
/,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



qSystem
    r    s

ŒÿÿÿØÿÿÿ
‹ÿÿÿ×ÿÿÿ

 
 
 
1
2'
7,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



vmscorlib
    w    x

‡ÿÿÿØÿÿÿ
†ÿÿÿ×ÿÿÿ

 
 
 
8,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



{System.Data
    |    }

‚ÿÿÿØÿÿÿ
ÿÿÿ×ÿÿÿ

 
 
 
9,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



€System.Drawing
        ‚

}ÿÿÿØÿÿÿ
|ÿÿÿ×ÿÿÿ

 
 
 
:,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



…System.Windows.Forms
    †    ‡

xÿÿÿØÿÿÿ
wÿÿÿ×ÿÿÿ

 
 
 
;,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



ŠSystem
    ‹    Œ

sÿÿÿØÿÿÿ
rÿÿÿ×ÿÿÿ

 
 
 
=
>'
C,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



    DBUtility
        ‘

nÿÿÿØÿÿÿ
mÿÿÿ×ÿÿÿ

 
 
 
D,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



”mscorlib
    •    –

iÿÿÿØÿÿÿ
hÿÿÿ×ÿÿÿ

 
 
 
F
G'
Ð`FL,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



™System.Windows.Forms
    š    ›

dÿÿÿØÿÿÿ
cÿÿÿ×ÿÿÿ

 
 
 
M,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



žmscorlib
    Ÿ     

_ÿÿÿØÿÿÿ
^ÿÿÿ×ÿÿÿ

 
 
 
N,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



£    Pub_Class
    ¤    ¥

ZÿÿÿØÿÿÿ
Yÿÿÿ×ÿÿÿ

 
 
 
O,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



¨System
    ©    ª

UÿÿÿØÿÿÿ
Tÿÿÿ×ÿÿÿ

 
 
 
P,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



­System.Drawing
    ®    ¯

PÿÿÿØÿÿÿ
Oÿÿÿ×ÿÿÿ

 
 
 
Q,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



²System.Data
    ³    ´

KÿÿÿØÿÿÿ
Jÿÿÿ×ÿÿÿ

 
 
 
S
T'
Y,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



·mscorlib
    ¸    ¹

FÿÿÿØÿÿÿ
Eÿÿÿ×ÿÿÿ

 
 
 
Z,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



¼System.Windows.Forms
    ½    ¾

AÿÿÿØÿÿÿ
@ÿÿÿ×ÿÿÿ

 
 
 
[,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



ÁPub_Control
    Â    Ã

<ÿÿÿØÿÿÿ
;ÿÿÿ×ÿÿÿ

 
 
 
\,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



Æ    Pub_Class
    Ç    È

7ÿÿÿØÿÿÿ
6ÿÿÿ×ÿÿÿ

 
 
 
],Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



ËSystem
    Ì    Í

2ÿÿÿØÿÿÿ
1ÿÿÿ×ÿÿÿ

 
 
 
^,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



Р   SQLHelper
    Ñ    Ò

-ÿÿÿØÿÿÿ
,ÿÿÿ×ÿÿÿ

 
 
 
_,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



ÕSystem.Data
    Ö    ×

(ÿÿÿØÿÿÿ
'ÿÿÿ×ÿÿÿ

 
 
 
`,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



ÚSystem.Drawing
    Û    Ü

#ÿÿÿØÿÿÿ
"ÿÿÿ×ÿÿÿ

 
 
 
a,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility



ß Interop.Excel
    à    á

ÿÿÿØÿÿÿ
ÿÿÿ×ÿÿÿ

 
 
 
c·z\V4à‰
d'h
i'
m·z\V4à‰
n'r·z\V4à‰
s'w·z\V4à‰
x'|·z\V4à‰
}'°?_Õ
:
‚'†·z\V4à‰
‡'‹·z\V4à‰
Œ'
‘'
•·z\V4à‰
–'š·z\V4à‰
›'Ÿ·z\V4à‰
 '¤
¥'
©·z\V4à‰
ª'®°?_Õ
:
¯'³·z\V4à‰
´'¸·z\V4à‰
¹'½·z\V4à‰
¾'Â
Ã'
Ð`FÇ
È'
Ì·z\V4à‰
Í'Ñ
Ò'
Ö·z\V4à‰
×'Û°?_Õ
:
Ü'à
á'