Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/SIC-12 into develop
This commit is contained in:
commit
48f9d22026
@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
|
|||||||
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
|
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
|
||||||
//通过使用 "*",如下所示:
|
//通过使用 "*",如下所示:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.4.8.51210")]
|
[assembly: AssemblyVersion("1.1.5.60605")]
|
||||||
|
|||||||
@ -90,8 +90,8 @@
|
|||||||
<Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block>
|
<Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block>
|
||||||
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2752"/>
|
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2752"/>
|
||||||
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2792"/>
|
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2792"/>
|
||||||
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2832"/>
|
<Block type="ai" index="4" size="10" value_type="float" variable="DB100.DBD2832"/>
|
||||||
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2872"/>
|
<Block type="ao" index="4" size="10" value_type="float" variable="DB100.DBD2872"/>
|
||||||
</Blocks>
|
</Blocks>
|
||||||
</IoProvider>
|
</IoProvider>
|
||||||
|
|
||||||
@ -108,8 +108,8 @@
|
|||||||
<Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block>
|
<Block type="ao" index="2" size="40" value_type="float" variable="DB100.DBD2592"></Block>
|
||||||
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2752"/>
|
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2752"/>
|
||||||
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2792"/>
|
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2792"/>
|
||||||
<Block type="ai" index="3" size="10" value_type="float" variable="DB100.DBD2832"/>
|
<Block type="ai" index="4" size="10" value_type="float" variable="DB100.DBD2832"/>
|
||||||
<Block type="ao" index="3" size="10" value_type="float" variable="DB100.DBD2872"/>
|
<Block type="ao" index="4" size="10" value_type="float" variable="DB100.DBD2872"/>
|
||||||
</Blocks>
|
</Blocks>
|
||||||
</IoProvider>
|
</IoProvider>
|
||||||
|
|
||||||
|
|||||||
@ -51,7 +51,7 @@ using System.Windows;
|
|||||||
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
|
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
|
||||||
// 方法是按如下所示使用“*”: :
|
// 方法是按如下所示使用“*”: :
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.1.3.60601")]
|
[assembly: AssemblyVersion("1.1.5.60605")]
|
||||||
[assembly: AssemblyInformationalVersion("氮化硅12寸(无EFEM)")]
|
[assembly: AssemblyInformationalVersion("氮化硅12寸(无EFEM)")]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -55,6 +55,6 @@ using System.Windows;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.1.3.60601")]
|
[assembly: AssemblyVersion("1.1.5.60605")]
|
||||||
[assembly: AssemblyInformationalVersion("氮化硅12寸(无EFEM)")]
|
[assembly: AssemblyInformationalVersion("氮化硅12寸(无EFEM)")]
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user