You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

nodyang 48e1497789 Merge branch 'wangsr' into dep_yangw ... # Conflicts: # Mesnac.DoUtils/DoControl.cs		2 years ago
..
ElectronicMachinery.Designer.cs	change - 电机初始化状态监测	2 years ago
ElectronicMachinery.cs	Merge branch 'wangsr' into dep_yangw	2 years ago
ElectronicMachinery.resx	change - 电机初始化状态监测	2 years ago
ElectronicMachinery_2.Designer.cs	change - 电机初始化状态监测	2 years ago
ElectronicMachinery_2.cs	Merge branch 'wangsr' into dep_yangw	2 years ago
ElectronicMachinery_2.resx	change - 电机初始化状态监测	2 years ago
ElectronicMachinery_3.Designer.cs	change - 电机初始化状态监测	2 years ago
ElectronicMachinery_3.cs	change - 电机初始化状态监测	2 years ago
ElectronicMachinery_3.resx	change - 电机初始化状态监测	2 years ago