zty f13a0d227a Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into zty %!s(int64=2) %!d(string=hai) anos
..
1-UI f13a0d227a Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into zty %!s(int64=2) %!d(string=hai) anos
2-CommonFunction 0a4bbec9fc Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into zty %!s(int64=2) %!d(string=hai) anos
3-ServiceCenter baaead47b6 Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into zty %!s(int64=2) %!d(string=hai) anos
OTSDelegateEvent d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
Properties ae97c0df63 修改版本号2.5 %!s(int64=2) %!d(string=hai) anos
ReportTemplate 12131a3f90 修复报告bug导出时页码因为字符集原因导致不显示或者乱码现象 %!s(int64=2) %!d(string=hai) anos
ResourceManage 2bf85eee7e 报告程序中英文,grid表更改完成版本1 %!s(int64=3) %!d(string=hai) anos
Resources 501c35ccfb dev国标导出部分(未完成) %!s(int64=3) %!d(string=hai) anos
App.config 92afa09f46 添加二次采集功能 %!s(int64=3) %!d(string=hai) anos
DataMgrFun.cd d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
Help.Designer.cs 1ce3798a1f 报告程序添加帮助界面说明 %!s(int64=3) %!d(string=hai) anos
Help.cs 1ce3798a1f 报告程序添加帮助界面说明 %!s(int64=3) %!d(string=hai) anos
Help.resx 1ce3798a1f 报告程序添加帮助界面说明 %!s(int64=3) %!d(string=hai) anos
OTSIncAReport.ico d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
OTSIncAReportApp.csproj aaa04e9a84 Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into zty %!s(int64=2) %!d(string=hai) anos
OTSIncAReportApp.csproj.user 8ad140daee 报告国标C++部分,去除无效颗粒 %!s(int64=2) %!d(string=hai) anos
Program.cs 6bd835c00c binding the Nlog window to a window which is in our application. %!s(int64=3) %!d(string=hai) anos
packages.config ef3ac41168 Merge branch 'release2.31' into Release2.4 %!s(int64=3) %!d(string=hai) anos