diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
index e023a98..3bd1626 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
@@ -366,9 +366,13 @@
WayValve.cs
+<<<<<<< Updated upstream
UserControl
+=======
+
+>>>>>>> Stashed changes
Chuiqizhi.cs
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
index dbc202b..0c0ec11 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
@@ -1,6 +1,13 @@
@@ -165,7 +165,7 @@
Fill
0, 0
MCDataGridView13
- 380, 145
+ 541, 140
5
@@ -198,7 +198,7 @@
Fill
0, 0
MCDataGridView14
- 380, 145
+ 541, 140
4
糊化机(#A)
@@ -241,9 +241,9 @@
糊化机(#B)
TabPage6
- 511, 168
+ 539, 153
TabControl3
- 388, 171
+ 549, 166
@@ -276,14 +276,14 @@
Fill
3, 17
MCDataGridView2
- 373, 107
+ 524, 107
3
False
干混机称量配方
- 24, 38
+ 6, 20
GroupBox4
- 379, 127
+ 530, 127
4
@@ -317,7 +317,7 @@
Fill
3, 17
MCDataGridView8
- 373, 107
+ 543, 107
3
@@ -350,14 +350,14 @@
Fill
3, 17
MCDataGridView9
- 373, 107
+ 543, 107
2
False
干混机混合配方
- 508, 21
+ 539, 20
GroupBox3
- 379, 127
+ 549, 127
1
@@ -389,9 +389,9 @@
True
False
False
- 4, 117
+ 4, 158
MCDataGridView5
- 373, 113
+ 516, 155
4
@@ -423,7 +423,7 @@
False
4, 3
MCDataGridView1
- 373, 113
+ 516, 149
3
糊化机(#A)
@@ -457,9 +457,9 @@
True
False
False
- 4, 119
+ 4, 158
MCDataGridView6
- 373, 113
+ 516, 155
6
@@ -489,17 +489,17 @@
True
False
False
- 4, 5
+ 4, 3
MCDataGridView7
- 373, 113
+ 516, 149
5
糊化机(#B)
TabPage2
- 27, 168
+ 6, 150
TabControl1
- 388, 262
+ 531, 344
False
明细