Merge remote-tracking branch 'haiwei/dep' into dep

Main/MCEdit/Data/EventConfig/小料称量/榄菊重量参数管理.xml

@@ -12,6 +12,8 @@
                 <Caption>修改重量参数</Caption>
                 <Remark>修改重量参数</Remark>
             </Action>
+
+
             <Action action="33A0B8BA7C7527965EA3D68B25A9CCFA">
                 <Caption>数据上传</Caption>
                 <Remark>数据上传</Remark>

Main/MCEdit/Data/MCProject/nodeDevice.xml

@@ -272,6 +272,7 @@
           <Data name="conveyV5_SV" runname="conveyV5_SV" start="341" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
           <Data name="purgeV5_PV" runname="purgeV5_PV" start="343" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
           <Data name="purgeV5_SV" runname="purgeV5_SV" start="345" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="" />
+            
           <Data name="Silo0_HighSpeed" runname="Silo0_HighSpeed" start="347" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="高速频率" />
           <Data name="Silo0_LowSpeed" runname="Silo0_LowSpeed" start="349" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="低速频率" />
           <Data name="Silo0_WeightSlow" runname="Silo0_WeightSlow" start="351" len="2" method="Default_Float()" max="" issave="False" subtractor="" remark="快慢值值值" />